合同评审关联项目

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

@@ -1,19 +1,14 @@
 package com.ruoyi.web.controller.oa;
 
+import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.SnowFlake;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -73,9 +68,19 @@ public class CmcContractMeetingController extends BaseController
      */
     @Log(title = "cmc合同会审", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CmcContractMeeting cmcContractMeeting)
+    public AjaxResult add(@RequestParam("form")String formData)
     {
+        JSONObject formDataJson = JSONObject.parse(formData);
+        CmcContractMeeting cmcContractMeeting = new CmcContractMeeting();
         cmcContractMeeting.setMeetingId(new SnowFlake().generateId());
+        cmcContractMeeting.setContractId(formDataJson.getString("contractId"));
+        cmcContractMeeting.setMeetingTime(formDataJson.getDate("meetingTime"));
+        cmcContractMeeting.setPlace(formDataJson.getString("place"));
+        cmcContractMeeting.setHostId(formDataJson.getLong("hostId"));
+        if (formDataJson.getJSONArray("users").size() > 0) {
+            String userString = formDataJson.getString("users").substring(1, formDataJson.getString("users").length() - 1);
+            cmcContractMeeting.setUsers(userString);
+        }
         return toAjax(cmcContractMeetingService.insertCmcContractMeeting(cmcContractMeeting));
     }
 
@@ -84,8 +89,13 @@ public class CmcContractMeetingController extends BaseController
      */
     @Log(title = "cmc合同会审", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody CmcContractMeeting cmcContractMeeting)
+    public AjaxResult edit(@RequestParam("form")String formData)
     {
+        JSONObject formDataJson = JSONObject.parse(formData);
+        CmcContractMeeting cmcContractMeeting = cmcContractMeetingService.selectCmcContractMeetingByContractId(formDataJson.getString("contractId"));
+        cmcContractMeeting.setDocument(formDataJson.getString("document"));
+        cmcContractMeeting.setConclusion(formDataJson.getString("conclusion"));
+        cmcContractMeeting.setCommentTime(new Date());
         return toAjax(cmcContractMeetingService.updateCmcContractMeeting(cmcContractMeeting));
     }
 

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

@@ -2,6 +2,7 @@ package com.ruoyi.oa.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -33,6 +34,8 @@ public class CmcContractMeeting extends BaseEntity
     @Excel(name = "评审主持人")
     private Long hostId;
 
+    private SysUser hostUser;
+
     /** 评审地点 */
     @Excel(name = "评审地点")
     private String place;
@@ -90,6 +93,15 @@ public class CmcContractMeeting extends BaseEntity
     {
         return hostId;
     }
+    public void setHostUser(SysUser hostUser)
+    {
+        this.hostUser = hostUser;
+    }
+
+    public SysUser getHostUser()
+    {
+        return hostUser;
+    }
     public void setPlace(String place)
     {
         this.place = place;

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

@@ -24,7 +24,7 @@ public class CmcSubContract extends BaseEntity
 
     /** 主合同id */
     @Excel(name = "主合同id")
-    private String contractId;
+    private String projectId;
 
     /** 合同名称 */
     @Excel(name = "合同名称")
@@ -85,66 +85,66 @@ public class CmcSubContract extends BaseEntity
     @Excel(name = "分管审批日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date managerTime;
 
-    public void setSubContractId(String subContractId) 
+    public void setSubContractId(String subContractId)
     {
         this.subContractId = subContractId;
     }
 
-    public String getSubContractId() 
+    public String getSubContractId()
     {
         return subContractId;
     }
-    public void setContractId(String contractId) 
+    public void setProjectId(String projectId)
     {
-        this.contractId = contractId;
+        this.projectId = projectId;
     }
 
-    public String getContractId() 
+    public String getProjectId()
     {
-        return contractId;
+        return projectId;
     }
-    public void setSubContractName(String subContractName) 
+    public void setSubContractName(String subContractName)
     {
         this.subContractName = subContractName;
     }
 
-    public String getSubContractName() 
+    public String getSubContractName()
     {
         return subContractName;
     }
-    public void setSubAmount(BigDecimal subAmount) 
+    public void setSubAmount(BigDecimal subAmount)
     {
         this.subAmount = subAmount;
     }
 
-    public BigDecimal getSubAmount() 
+    public BigDecimal getSubAmount()
     {
         return subAmount;
     }
-    public void setPartnerId(String partnerId) 
+    public void setPartnerId(String partnerId)
     {
         this.partnerId = partnerId;
     }
 
-    public String getPartnerId() 
+    public String getPartnerId()
     {
         return partnerId;
     }
-    public void setContactPerson(String contactPerson) 
+    public void setContactPerson(String contactPerson)
     {
         this.contactPerson = contactPerson;
     }
 
-    public String getContactPerson() 
+    public String getContactPerson()
     {
         return contactPerson;
     }
-    public void setDrafter(Long drafter) 
+    public void setDrafter(Long drafter)
     {
         this.drafter = drafter;
     }
 
-    public Long getDrafter() 
+    public Long getDrafter()
     {
         return drafter;
     }
@@ -166,48 +166,48 @@ public class CmcSubContract extends BaseEntity
     {
         return managerUser;
     }
-    public void setDraftTime(Date draftTime) 
+    public void setDraftTime(Date draftTime)
     {
         this.draftTime = draftTime;
     }
 
-    public Date getDraftTime() 
+    public Date getDraftTime()
     {
         return draftTime;
     }
-    public void setSignDate(Date signDate) 
+    public void setSignDate(Date signDate)
     {
         this.signDate = signDate;
     }
 
-    public Date getSignDate() 
+    public Date getSignDate()
     {
         return signDate;
     }
-    public void setSignRemark(String signRemark) 
+    public void setSignRemark(String signRemark)
     {
         this.signRemark = signRemark;
     }
 
-    public String getSignRemark() 
+    public String getSignRemark()
     {
         return signRemark;
     }
-    public void setSignScan(String signScan) 
+    public void setSignScan(String signScan)
     {
         this.signScan = signScan;
     }
 
-    public String getSignScan() 
+    public String getSignScan()
     {
         return signScan;
     }
-    public void setCommentType(String commentType) 
+    public void setCommentType(String commentType)
     {
         this.commentType = commentType;
     }
 
-    public String getCommentType() 
+    public String getCommentType()
     {
         return commentType;
     }
@@ -244,7 +244,7 @@ public class CmcSubContract extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("subContractId", getSubContractId())
-            .append("contractId", getContractId())
+            .append("projectId", getProjectId())
             .append("subContractName", getSubContractName())
             .append("subAmount", getSubAmount())
             .append("partnerId", getPartnerId())

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

@@ -14,29 +14,36 @@
         <result property="conclusion"    column="conclusion"    />
         <result property="document"    column="document"    />
         <result property="commentTime"    column="comment_time"    />
+        <association property="hostUser"    javaType="SysUser"         resultMap="HostUserResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="HostUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="nick_name"    />
     </resultMap>
 
     <sql id="selectCmcContractMeetingVo">
-        select meeting_id, contract_id, meeting_time, host_id, place, users, conclusion, document, comment_time from cmc_contract_meeting
+        select cm.meeting_id, cm.contract_id, cm.meeting_time, cm.host_id, u.nick_name as nick_name, cm.place, cm.users, cm.conclusion, cm.document, cm.comment_time from cmc_contract_meeting as cm
+        left join sys_user as u on u.user_id = cm.host_id
     </sql>
 
     <select id="selectCmcContractMeetingList" parameterType="CmcContractMeeting" resultMap="CmcContractMeetingResult">
         <include refid="selectCmcContractMeetingVo"/>
         <where>
-            <if test="contractId != null  and contractId != ''"> and contract_id = #{contractId}</if>
-            <if test="meetingTime != null "> and meeting_time = #{meetingTime}</if>
-            <if test="hostId != null "> and host_id = #{hostId}</if>
-            <if test="place != null  and place != ''"> and place = #{place}</if>
-            <if test="users != null  and users != ''"> and users = #{users}</if>
-            <if test="conclusion != null  and conclusion != ''"> and conclusion = #{conclusion}</if>
-            <if test="document != null  and document != ''"> and document = #{document}</if>
-            <if test="commentTime != null "> and comment_time = #{commentTime}</if>
+            <if test="contractId != null  and contractId != ''"> and cm.contract_id = #{contractId}</if>
+            <if test="meetingTime != null "> and cm.meeting_time = #{meetingTime}</if>
+            <if test="hostId != null "> and cm.host_id = #{hostId}</if>
+            <if test="place != null  and place != ''"> and cm.place = #{place}</if>
+            <if test="users != null  and users != ''"> and cm.users = #{users}</if>
+            <if test="conclusion != null  and conclusion != ''"> and cm.conclusion = #{conclusion}</if>
+            <if test="document != null  and document != ''"> and cm.document = #{document}</if>
+            <if test="commentTime != null "> and cm.comment_time = #{commentTime}</if>
         </where>
     </select>
 
     <select id="selectCmcContractMeetingByContractId" parameterType="String" resultMap="CmcContractMeetingResult">
         <include refid="selectCmcContractMeetingVo"/>
-        where contract_id = #{contractId}
+        where cm.contract_id = #{contractId}
     </select>
 
     <insert id="insertCmcContractMeeting" parameterType="CmcContractMeeting">

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

@@ -15,7 +15,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCmcProjectContractList" parameterType="CmcProjectContract" resultMap="CmcProjectContractResult">
         <include refid="selectCmcProjectContractVo"/>
-        <where>  
+        <where>
+            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
+            <if test="contractId != null  and contractId != ''"> and contract_id = #{contractId}</if>
         </where>
     </select>
     

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

@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="CmcSubContract" id="CmcSubContractResult">
         <result property="subContractId"    column="sub_contract_id"    />
-        <result property="contractId"    column="contract_id"    />
+        <result property="projectId"    column="project_id"    />
         <result property="subContractName"    column="sub_contract_name"    />
         <result property="subAmount"    column="sub_amount"    />
         <result property="partnerId"    column="partner_id"    />
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcSubContractVo">
-        select sc.sub_contract_id, sc.contract_id, sc.sub_contract_name, sc.sub_amount, sc.partner_id, sc.contact_person, sc.drafter, u.nick_name as draft_nick_name, sc.draft_time,
+        select sc.sub_contract_id, sc.project_id, sc.sub_contract_name, sc.sub_amount, sc.partner_id, sc.contact_person, sc.drafter, u.nick_name as draft_nick_name, sc.draft_time,
                sc.remark, sc.sign_date, sc.sign_remark, sc.sign_scan, sc.comment_type, sc.manager_comment, sc.manager_user_id, u1.nick_name as manager_nick_name, sc.manager_time from cmc_sub_contract as sc
         left join sys_user as u on u.user_id = sc.drafter
         left join sys_user as u1 on u1.user_id = sc.manager_user_id
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCmcSubContractList" parameterType="CmcSubContract" resultMap="CmcSubContractResult">
         <include refid="selectCmcSubContractVo"/>
         <where>  
-            <if test="contractId != null  and contractId != ''"> and sc.contract_id = #{contractId}</if>
+            <if test="projectId != null  and projectId != ''"> and sc.project_id = #{projectId}</if>
             <if test="subContractName != null  and subContractName != ''"> and sc.sub_contract_name like concat('%', sc.#{subContractName}, sc.'%')</if>
             <if test="subAmount != null "> and sc.sub_amount = #{subAmount}</if>
             <if test="partnerId != null  and partnerId != ''"> and sc.partner_id = #{partnerId}</if>
@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into cmc_sub_contract
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="subContractId != null">sub_contract_id,</if>
-            <if test="contractId != null">contract_id,</if>
+            <if test="projectId != null">project_id,</if>
             <if test="subContractName != null">sub_contract_name,</if>
             <if test="subAmount != null">sub_amount,</if>
             <if test="partnerId != null">partner_id,</if>
@@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="subContractId != null">#{subContractId},</if>
-            <if test="contractId != null">#{contractId},</if>
+            <if test="projectId != null">#{projectId},</if>
             <if test="subContractName != null">#{subContractName},</if>
             <if test="subAmount != null">#{subAmount},</if>
             <if test="partnerId != null">#{partnerId},</if>
@@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateCmcSubContract" parameterType="CmcSubContract">
         update cmc_sub_contract
         <trim prefix="SET" suffixOverrides=",">
-            <if test="contractId != null">contract_id = #{contractId},</if>
+            <if test="projectId != null">project_id = #{projectId},</if>
             <if test="subContractName != null">sub_contract_name = #{subContractName},</if>
             <if test="subAmount != null">sub_amount = #{subAmount},</if>
             <if test="partnerId != null">partner_id = #{partnerId},</if>

oa-ui/src/assets/icons/svg/desktop.svg

@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1714012227825" class="icon" viewBox="0 0 4257 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2057" xmlns:xlink="http://www.w3.org/1999/xlink" width="831.4453125" height="200"><path d="M1633.307598 735.652979h-256.530279c-5.739491-0.124772-11.229438 1.996345-15.346899 5.989034-4.117461 3.992689-6.363348 9.482637-6.363348 15.222127v161.953455c0 5.739491 2.370659 11.229438 6.363348 15.222127 4.117461 3.992689 9.607408 6.113805 15.346899 5.989034H1633.307598c5.739491 0.124772 11.229438-1.996345 15.346899-5.989034 4.117461-3.992689 6.363348-9.482637 6.363349-15.222127V756.739369c0-5.739491-2.370659-11.229438-6.363349-15.222128-4.117461-3.992689-9.607408-6.113805-15.346899-5.864262z m0-258.651395h-256.530279c-11.603753 0-21.08639 9.482637-21.086389 21.08639V660.041428c0 5.739491 2.370659 11.229438 6.363348 15.222128 4.117461 3.992689 9.607408 6.113805 15.346899 5.989033H1633.307598c5.739491 0.124772 11.229438-1.996345 15.346899-5.989033 4.117461-3.992689 6.363348-9.482637 6.363349-15.222128V498.087974c0-5.739491-2.370659-11.229438-6.363349-15.222128-4.117461-3.867918-9.607408-5.989034-15.346899-5.864262z m0 0" fill="#2c2c2c" p-id="2058"></path><path d="M2215.865902 308.934324H1928.641825l-43.545266-26.576337V254.533934h126.518338c10.605581-0.124772 20.836847-4.616547 28.198367-12.22761 7.361521-7.611064 11.478981-17.967101 11.229438-28.572682v-172.18472c0.124772-10.605581-3.867918-20.961618-11.229438-28.572682-7.361521-7.611064-17.592787-12.102839-28.198367-12.227611h-315.671987c-10.605581 0.124772-20.836847 4.616547-28.198368 12.227611-7.361521 7.611064-11.478981 17.967101-11.229438 28.572682v172.18472c-0.124772 10.605581 3.867918 20.961618 11.229438 28.572682 7.361521 7.611064 17.592787 12.102839 28.198368 12.22761h127.890825v28.572682l-43.545267 26.576338H1444.777807v-4.117461l-5.489948-18.341416c-4.367004-15.845985-4.367004-32.565371 0-48.286585l9.482637-26.576337c5.240405-15.721214 7.361521-32.440599 6.113805-49.035214v-25.827708c-2.495431-14.972584-16.2203-25.453393-31.317656-23.831363h-68.000487c-13.974412 0.623858-25.578165 11.229438-27.200195 25.20385v25.827708c-1.247715 16.594614 0.873401 33.189229 6.113805 49.035214l9.482637 26.576337c4.367004 15.845985 4.367004 32.565371 0 48.286585l-5.489947 18.341416v4.11746h-162.702084c-13.101011 0.374315-23.831363 10.730352-24.455221 23.831364v68.000487c0 13.600097 10.855124 24.829536 24.455221 25.203851h24.455221c13.600097 0.374315 24.455221 11.478981 24.455221 25.20385v544.378214c0 13.600097 10.855124 24.829536 24.455221 25.20385h24.455222c13.600097-0.374315 24.455221-11.478981 24.455221-25.20385V453.170221c0-13.600097 10.855124-24.829536 24.455221-25.203851h745.135616c13.600097 0.374315 24.455221 11.478981 24.455221 25.203851v544.378213c0 13.600097 10.855124 24.829536 24.455221 25.203851h24.455221c13.600097-0.374315 24.455221-11.478981 24.455221-25.203851V453.170221c0-13.600097 10.855124-24.829536 24.455222-25.203851h24.455221c6.987206 0 13.724869-2.869745 18.590959-8.11015 4.741318-5.115633 7.236749-12.102839 6.612891-19.090045v-68.000487c0.124772-13.101011-10.605581-23.457049-23.706592-23.831364z m0 0" fill="#2c2c2c" p-id="2059"></path><path d="M2049.794987 498.087974c0-5.739491-2.370659-11.229438-6.363348-15.222128-4.117461-3.992689-9.607408-6.113805-15.346899-5.989034H1772.178318c-5.739491-0.124772-11.229438 1.996345-15.346899 5.989034-4.117461 3.992689-6.363348 9.482637-6.363348 15.222128v420.604849c0 5.739491 2.370659 11.229438 6.363348 15.222128 4.117461 3.992689 9.607408 6.113805 15.346899 5.989033h255.906422c5.739491 0.124772 11.229438-1.996345 15.346899-5.989033 4.117461-3.992689 6.363348-9.482637 6.363348-15.222128V498.087974z m0 0" fill="#2c2c2c" p-id="2060"></path></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1714015008302" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6849" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M464.085 684.477H266.418c-4.425-0.094-8.653 1.539-11.825 4.617-3.176 3.077-4.906 7.307-4.906 11.728v124.796c0 4.421 1.828 8.65 4.906 11.728 3.172 3.077 7.4 4.711 11.825 4.617h197.667c4.425 0.094 8.653-1.539 11.825-4.617s4.903-7.307 4.903-11.728v-124.89c0-4.425-1.825-8.653-4.903-11.731-3.172-3.075-7.4-4.711-11.825-4.52z m0-199.299H266.418c-8.943 0-16.25 7.307-16.25 16.246v124.793c0 4.425 1.828 8.653 4.903 11.732 3.176 3.073 7.404 4.71 11.825 4.613h197.189c4.425 0.097 8.653-1.539 11.825-4.613 3.172-3.078 4.903-7.307 4.903-11.732V501.424c0-4.421-1.825-8.653-4.903-11.727a16.687 16.687 0 0 0-11.825-4.519z m0 0" p-id="6850"></path><path d="M912.973 355.671H691.655l-33.557-20.475v-21.441h97.488c8.173-0.094 16.058-3.556 21.728-9.422 5.674-5.866 8.845-13.846 8.653-22.017V149.641c0.098-8.173-2.979-16.152-8.653-22.018-5.67-5.865-13.556-9.323-21.728-9.421H512.349c-8.172 0.098-16.058 3.556-21.727 9.421-5.674 5.866-8.846 13.846-8.654 22.018v132.674c-0.097 8.172 2.98 16.152 8.654 22.017 5.669 5.866 13.556 9.327 21.727 9.422h98.546v22.017l-33.553 20.479H318.814v-3.176l-4.229-14.132c-3.367-12.209-3.367-25.092 0-37.207l7.307-20.479c4.037-12.111 5.67-24.997 4.71-37.782v-19.903c-1.922-11.536-12.498-19.614-24.132-18.361h-52.396c-10.767 0.478-19.711 8.65-20.96 19.418v19.903c-0.963 12.785 0.673 25.573 4.71 37.783l7.307 20.479c3.367 12.208 3.367 25.095 0 37.207l-4.228 14.135v3.172H111.53c-10.094 0.286-18.36 8.266-18.842 18.361v52.399c0 10.478 8.364 19.132 18.842 19.422h18.847c10.478 0.286 18.842 8.846 18.842 19.418v419.469c0 10.478 8.364 19.133 18.847 19.422h18.842c10.478-0.289 18.847-8.845 18.847-19.422V466.814c0-10.478 8.363-19.133 18.842-19.422h574.162c10.478 0.289 18.842 8.845 18.842 19.422v419.469c0 10.478 8.364 19.132 18.847 19.418h18.842c10.479-0.286 18.842-8.846 18.842-19.418V466.814c0-10.478 8.368-19.133 18.847-19.422h18.842a19.519 19.519 0 0 0 14.327-6.25c3.653-3.938 5.576-9.323 5.094-14.707v-52.399c0.095-10.095-8.175-18.075-18.269-18.365z m0 0" p-id="6851"></path><path d="M785.008 501.424c0-4.421-1.828-8.653-4.906-11.727-3.172-3.078-7.4-4.715-11.825-4.617H571.092c-4.424-0.098-8.653 1.538-11.825 4.617-3.176 3.074-4.903 7.306-4.903 11.727V825.52c0 4.421 1.825 8.653 4.903 11.727 3.172 3.078 7.401 4.715 11.825 4.617h197.185c4.425 0.098 8.653-1.538 11.825-4.617 3.176-3.073 4.906-7.306 4.906-11.727V501.424z m0 0" p-id="6852"></path></svg>

oa-ui/src/assets/icons/svg/equipment.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1714016041240" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8219" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M869 119.3H156.8c-36.4 0-66 29.6-66 66v657.9c0 36.4 29.6 66 66 66H869c36.4 0 66-29.6 66-66V185.3c0-36.4-29.6-66-66-66z m-4 70v176.6H160.8V189.3H865z m0 246.6V602H160.8V435.9H865zM160.8 839.2V672H865v167.2H160.8z" p-id="8220"></path><path d="M723.5 317.8h43c19.3 0 35-15.7 35-35s-15.7-35-35-35h-43c-19.3 0-35 15.7-35 35s15.7 35 35 35zM723.5 553.9h43c19.3 0 35-15.7 35-35s-15.7-35-35-35h-43c-19.3 0-35 15.7-35 35 0 19.4 15.7 35 35 35zM766.5 720.1h-43c-19.3 0-35 15.7-35 35s15.7 35 35 35h43c19.3 0 35-15.7 35-35 0-19.4-15.7-35-35-35z" p-id="8221"></path></svg>

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

@@ -2,53 +2,81 @@
   <div class="app-container">
     <el-row :gutter="20">
       <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-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="contractCode">
-                <el-input v-model="form.contractCode" :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="请输入合同编号" :disabled="taskName != '合同拟稿'"></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="请输入合同金额" :disabled="taskName != '合同拟稿'" />
+          <el-row :gutter="20">
+            <el-col :span="12" :xs="24">
+              <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="2" direction="vertical">
+                  <el-descriptions-item label="项目名称" label-class-name="my-label" :span="2">{{ 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 :gutter="20">
+                <el-col :span="12" :xs="24">
+                  <el-form-item label="合同编码" prop="contractCode">
+                    <el-input v-model="form.contractCode" placeholder="请输入合同编码" :disabled="taskName != '合同拟稿'"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12" :xs="24">
+                  <el-form-item label="合同编号" prop="contractNumber">
+                    <el-input v-model="form.contractNumber" placeholder="请输入合同编号"
+                      :disabled="taskName != '合同拟稿'"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="12" :xs="24">
+                  <el-form-item label="合同金额" prop="amount">
+                    <el-input v-model="form.amount" placeholder="请输入合同金额" :disabled="taskName != '合同拟稿'" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12" :xs="24">
+                  <el-form-item label="履约保证金" prop="deposit">
+                    <el-input v-model="form.deposit" placeholder="请输入履约保证金" :disabled="taskName != '合同拟稿'" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="履约保证金" prop="deposit">
-                <el-input v-model="form.deposit" placeholder="请输入履约保证金" :disabled="taskName != '合同拟稿'" />
+
+            <el-col :span="12" :xs="24">
+              <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-form-item>
+              <el-table v-loading="loading" :data="chooseProjectList">
+                <el-table-column label="项目编号" align="center" prop="projectNumber"></el-table-column>
+                <el-table-column label="项目名称" align="center" prop="projectName"></el-table-column>
+                <el-table-column label="项目负责人" align="center" prop="projectLeaderUser.nickName"></el-table-column>
+                <el-table-column label="承担部门" align="center" prop="undertakingDeptName"></el-table-column>
+              </el-table>
             </el-col>
+
           </el-row>
           <el-form-item label="合同文件" prop="contractDocument">
             <el-input v-model="form.contractDocument" placeholder="请输入合同文件" :disabled="taskName != '合同拟稿'" />
           </el-form-item>
+          <el-divider></el-divider>
           <el-form-item label="合同计划工作量：">
             <table border="1">
               <tr>
@@ -215,19 +243,19 @@
                 <td>评审时间</td>
                 <td>
                   <el-date-picker clearable v-model="meetingForm.meetingTime" type="date" value-format="yyyy-MM-dd"
-                    placeholder="请选择评审日期">
+                    placeholder="请选择评审日期" :disabled="taskName != '合同拟稿'">
                   </el-date-picker>
                 </td>
                 <td>评审地点</td>
                 <td>
-                  <el-select v-model="meetingForm.place" clearable style="width:120px">
+                  <el-select v-model="meetingForm.place" clearable style="width:120px" :disabled="taskName != '合同拟稿'">
                     <el-option v-for="item in placeList" :key="item.id" :label="item.name" :value="item.id">
                     </el-option>
                   </el-select>
                 </td>
                 <td>评审主持人</td>
                 <td>
-                  <el-select v-model="meetingForm.hostId" clearable style="width:120px">
+                  <el-select v-model="meetingForm.hostId" clearable style="width:120px" :disabled="taskName != '合同拟稿'">
                     <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
                     </el-option>
                   </el-select>
@@ -236,7 +264,8 @@
               <tr>
                 <td>参与评审人员</td>
                 <td colspan="5">
-                  <el-select v-model="meetingForm.users" multiple clearable style="width:600px">
+                  <el-select v-model="meetingForm.users" multiple clearable style="width:600px"
+                    :disabled="taskName != '合同拟稿'">
                     <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
                     </el-option>
                   </el-select>
@@ -245,19 +274,23 @@
               <tr>
                 <td>评审意见表</td>
                 <td colspan="5">
-                  <el-input v-model="meetingForm.document" clearable></el-input>
+                  <el-input v-model="meetingForm.document" clearable :disabled="taskName != '会议评审'"></el-input>
                 </td>
               </tr>
               <tr>
                 <td>评审结论</td>
                 <td colspan="5">
-                  <el-input type="textarea" v-model="meetingForm.conclusion" clearable></el-input>
+                  <el-input type="textarea" v-model="meetingForm.conclusion" clearable
+                    :disabled="taskName != '会议评审'"></el-input>
                 </td>
               </tr>
               <tr>
+                <td colspan="2"></td>
+                <td>主持人签名</td>
                 <td>
-                  <span class="auditor"> {{ meetingForm.User ? meetingForm.User.nickName : meetingUser }} </span>
+                  <span class="auditor"> {{ meetingForm.hostUser ? meetingForm.hostUser.nickName : hostUser }} </span>
                 </td>
+                <td>日期</td>
                 <td>
                   <span> {{ meetingForm.commentTime ? meetingForm.commentTime : commentTime }} </span>
                 </td>
@@ -311,13 +344,15 @@
 
 <script>
 import { parseTime } from "@/utils/ruoyi";
+import { listProject, getProject } from "@/api/oa/project/project";
 import { listDept } from '@/api/system/dept'
 import { listUser } from '@/api/system/user'
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
 import { getContractWork, addContractWork } from "@/api/oa/contract/contractWork";
 import { getContractPayment, addContractPayment } from "@/api/oa/contract/contractPayment";
 import { getContractComment, addContractComment, updateContractComment } from "@/api/oa/contract/contractComment";
-import { getContractMeeting, addContractMeeting } from "@/api/oa/contract/contractMeeting";
+import { getContractMeeting, addContractMeeting, updateContractMeeting } from "@/api/oa/contract/contractMeeting";
+import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
 import { listTender, getTender } from "@/api/oa/tender/tender";
 import { getUsersDeptLeader, getUsersManageLeader, getUsersDeptLeaderByDept } from '@/api/system/post.js'
@@ -344,6 +379,8 @@ export default {
       draftTime: undefined,
       managerUser: '',
       managerTime: undefined,
+      hostUser: '',
+      commentTime: undefined,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -379,14 +416,25 @@ export default {
       },
       // 表单参数
       form: {},
-      meetingForm: {},
+      meetingForm: {
+        users: [],
+      },
+      projectContractForm: {
+        projectIds: [],
+      },
       // 表单校验
       rules: {
+        contractCode: [
+          { required: true, message: '请输入合同编码', trigger: 'blur' },
+        ],
       },
       meetingOpen: false,
       commentOpen: false,
+      chooseProjectList: [],
+      projectList: [],
       deptList: [],
       userList: [],
+      users: undefined,
       workList: [{
         content: "",
         scale: "",
@@ -402,7 +450,7 @@ export default {
         paymentTime: undefined,
         remark: "",
       }],
-      placeList: [{ id: 0, name: '301会议室' }, { id: 1, name: '216会议室' }],
+      placeList: [{ id: '0', name: '301会议室' }, { id: '1', name: '216会议室' }],
       commentList: [
         {
           deptId: 105,
@@ -446,10 +494,15 @@ export default {
       this.draftUser = this.$store.getters.name;
       this.draftTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
+    else if (this.taskName == '会议评审') {
+      this.hostUser = this.$store.getters.name;
+      this.commentTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
     else if (this.taskName == '分管审核') {
       this.managerUser = this.$store.getters.name;
       this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
+    this.getProjectList();
     this.getDeptList();
     this.getTenderList();
     this.getUserList();
@@ -513,9 +566,31 @@ export default {
             }
           });
           getContractMeeting(this.taskForm.formId).then(res => {
-            if (res.data)
-              this.meetingForm = res.data;
+            if (res.data) {
+              let data = res.data;
+              if (res.data.users == null || res.data.users == undefined || res.data.users == "") {
+                data.users = []
+              } else {
+                data.users = data.users.split(',');
+                let arr = []
+                for (let d of data.users) {
+                  arr.push(parseInt(d))
+                }
+                data.users = arr;
+              }
+              this.meetingForm = data;
+            }
           });
+          listProjectContract({ contractId: this.taskForm.formId }).then(res => {
+            if (res.rows) {
+              for (let row of res.rows) {
+                this.projectContractForm.projectIds.push(row.projectId);
+                getProject(row.projectId).then(response => {
+                  this.chooseProjectList.push(response.data)
+                })
+              }
+            }
+          })
         }
       })
     },
@@ -528,6 +603,16 @@ export default {
         this.loading = false;
       });
     },
+    // 查询项目列表
+    getProjectList() {
+      this.loading = true
+      listProject({
+        pageNum: 1,
+        pageSize: 99999999
+      }).then(response => {
+        this.projectList = response.rows;
+      })
+    },
     getUserList() {
       listUser({ pageSize: 9999, pageNum: 1 }).then(res => {
         this.userList = res.rows
@@ -554,7 +639,6 @@ export default {
         getTender(val).then(res => {
           this.chooseTender = res.data;
           this.isSelect = true;
-          this.getContractCode(this.chooseTender)
         })
       } else {
         this.isSelect = false
@@ -577,39 +661,6 @@ export default {
       let partyAList = ['中国电建集团成都勘测设计研究院勘测设计分公司', '成勘院 水环境与城建工程分公司'];
       return partyAList.indexOf(chooseTender.partyA) != -1 ? '院内' : '院外';
     },
-    getContractCode(chooseTender) {
-      let contractCode = '';
-      if (chooseTender) {
-        if (this.getProjectSource(chooseTender) == '院内') {
-          listContract({ contractCode: 'C' }).then(res => {
-            if (res.total == 0)
-              contractCode = 'HT' + new Date().getFullYear() + 'C' + '001';
-            else
-              contractCode = 'HT' + new Date().getFullYear() + 'C' + this.fillZero(Number(res.rows[0].contractCode.substring(7, 10)) + 1);
-            this.$set(this.form, 'contractCode', contractCode);
-          })
-        }
-        else {
-          listContract({ contractCode: 'W' }).then(res => {
-            if (res.total == 0)
-              contractCode = 'HT' + new Date().getFullYear() + 'W' + '001';
-            else
-              contractCode = 'HT' + new Date().getFullYear() + 'W' + this.fillZero(Number(res.rows[0].contractCode.substring(7, 10)) + 1);
-            this.$set(this.form, 'contractCode', contractCode);
-          })
-        }
-      }
-    },
-    fillZero(number) {
-      let fullNumber = '';
-      if (number < 10)
-        fullNumber = '00' + number;
-      else if (number >= 10 & number < 100)
-        fullNumber = '0' + number;
-      else
-        fullNumber = number;
-      return fullNumber;
-    },
     addWorkList() {
       this.workList.push({
         content: "",
@@ -692,6 +743,14 @@ export default {
         }
       })
     },
+    handleSelectProject() {
+      this.chooseProjectList = [];
+      for (let projectId of this.projectContractForm.projectIds) {
+        getProject(projectId).then(res => {
+          this.chooseProjectList.push(res.data)
+        })
+      }
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -778,9 +837,20 @@ export default {
               }
               else if (this.taskName == '会议评审') {
                 this.meetingForm.contractId = this.form.contractId;
-                addContractMeeting(this.meetingForm);
-                this.$set(this.taskForm.variables, "approval", this.meetingForm.hostId);
-                this.$set(this.taskForm.variables, "commentType", '1');
+                let formData = new FormData();
+                let jsonForm = JSON.stringify(this.meetingForm);
+                formData.append("form", jsonForm);
+                updateContractMeeting(formData);
+                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')
+                  });
+                })
+              }
+              else if (this.taskName == '合同签订') {
                 complete(this.taskForm).then(response => {
                   this.$modal.msgSuccess(response.msg);
                   this.$emit('goBack')
@@ -802,6 +872,9 @@ export default {
               payment.contractId = this.form.contractId
               addContractPayment(payment);
             }
+            for (let projectId of this.projectContractForm.projectIds) {
+              addProjectContract({projectId: projectId, contractId: this.form.contractId});
+            }
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
               if (this.commentOpen == false && this.meetingOpen == false) {
@@ -831,7 +904,10 @@ export default {
               }
               else if (this.commentOpen == false && this.meetingOpen == true) {
                 this.meetingForm.contractId = this.form.contractId;
-                addContractMeeting(this.meetingForm);
+                let formData = new FormData();
+                let jsonForm = JSON.stringify(this.meetingForm);
+                formData.append("form", jsonForm);
+                addContractMeeting(formData);
                 this.$set(this.taskForm.variables, "approval", this.meetingForm.hostId);
                 this.$set(this.taskForm.variables, "commentType", '1');
                 complete(this.taskForm).then(response => {
@@ -864,7 +940,7 @@ export default {
 }
 </script>
 
-<style>
+<style lang="scss" scoped>
 table {
   /*居中*/
   margin: 0 auto;

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

@@ -2,9 +2,29 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="18" :xs="24">
+        <h2 class="text-center">分包合同评审表</h2>
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          <el-form-item label="主合同id" prop="contractId">
-            <el-input v-model="form.contractId" placeholder="请输入主合同id" />
+          <el-form-item label="项目编号：" prop="projectId">
+            <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"
+                :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>
+              <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
+              }}</el-descriptions-item>
+              <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
+                chooseProject.projectLeaderUser.nickName : ''
+              }}</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>
           </el-form-item>
           <el-form-item label="合同名称" prop="subContractName">
             <el-input v-model="form.subContractName" placeholder="请输入合同名称" />
@@ -63,6 +83,7 @@
 
 <script>
 import { parseTime } from "@/utils/ruoyi";
+import { listProject, getProject } from "@/api/oa/project/project";
 import { listSubContract, getSubContract, delSubContract, addSubContract, updateSubContract } from "@/api/oa/contract/subContract";
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
@@ -83,7 +104,7 @@ export default {
   name: "SubContract",
   data() {
     return {
-      drafter:'',
+      drafter: '',
       draftTime: undefined,
       // 遮罩层
       loading: true,
@@ -135,6 +156,7 @@ export default {
       this.drafter = this.$store.getters.name;
       this.draftTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
+    this.getProjectList();
     this.getList();
     flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
       this.flowData = res.data;
@@ -150,6 +172,28 @@ export default {
         this.loading = false;
       });
     },
+    // 查询项目列表
+    getProjectList() {
+      this.loading = true
+      listProject({
+        pageNum: 1,
+        pageSize: 99999999
+      }).then(response => {
+        this.projectList = response.rows;
+      })
+    },
+    // 选择项目
+    handleSelectProject(val) {
+      if (val != "" && val != undefined && val != null) {
+        getProject(val).then(res => {
+          this.chooseProject = res.data;
+          this.isSelect = true
+        })
+      } else {
+        this.isSelect = false
+      }
+
+    },
     // 取消按钮
     cancel() {
       this.open = false;