合同拟稿增加表单

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

@@ -47,6 +47,8 @@ public class CmcContract extends BaseEntity
 
     private SysUser draftUser;
 
+    private SysUser managerUser;
+
     /** 拟稿日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "拟稿日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -69,6 +71,19 @@ public class CmcContract extends BaseEntity
     @Excel(name = "评审方式")
     private String commentType;
 
+    /** 分管审批意见 */
+    @Excel(name = "分管审批意见")
+    private String managerComment;
+
+    /** 分管审批人 */
+    @Excel(name = "分管审批人")
+    private Long managerUserId;
+
+    /** 分管审批日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "分管审批日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date managerTime;
+
     public void setContractId(String contractId)
     {
         this.contractId = contractId;
@@ -142,6 +157,15 @@ public class CmcContract extends BaseEntity
     {
         return draftUser;
     }
+    public void setManagerUser(SysUser managerUser)
+    {
+        this.managerUser = managerUser;
+    }
+
+    public SysUser getManagerUser()
+    {
+        return managerUser;
+    }
     public void setDraftTime(Date draftTime)
     {
         this.draftTime = draftTime;
@@ -188,6 +212,34 @@ public class CmcContract extends BaseEntity
         return commentType;
     }
 
+    public void setManagerComment(String managerComment)
+    {
+        this.managerComment = managerComment;
+    }
+
+    public String getManagerComment()
+    {
+        return managerComment;
+    }
+    public void setManagerUserId(Long managerUserId)
+    {
+        this.managerUserId = managerUserId;
+    }
+
+    public Long getManagerUserId()
+    {
+        return managerUserId;
+    }
+    public void setManagerTime(Date managerTime)
+    {
+        this.managerTime = managerTime;
+    }
+
+    public Date getManagerTime()
+    {
+        return managerTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -203,6 +255,9 @@ public class CmcContract extends BaseEntity
                 .append("signRemark", getSignRemark())
                 .append("signScan", getSignScan())
                 .append("commentType", getCommentType())
+                .append("managerComment", getManagerComment())
+                .append("managerUserId", getManagerUserId())
+                .append("managerTime", getManagerTime())
                 .toString();
     }
 }

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

@@ -18,7 +18,11 @@
         <result property="signRemark"    column="sign_remark"    />
         <result property="signScan"    column="sign_scan"    />
         <result property="commentType"    column="comment_type"    />
+        <result property="managerComment"    column="manager_comment"    />
+        <result property="managerUserId"    column="manager_user_id"    />
+        <result property="managerTime"    column="manager_time"    />
         <association property="draftUser"    javaType="SysUser"         resultMap="DraftUserResult" />
+        <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="DraftUserResult">
@@ -26,10 +30,16 @@
         <result property="nickName"    column="draft_nick_name"    />
     </resultMap>
 
+    <resultMap type="SysUser" id="ManagerUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="manager_nick_name"    />
+    </resultMap>
+
     <sql id="selectCmcContractVo">
         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
+               c.sign_scan, c.comment_type, c.manager_comment, c.manager_user_id, u1.nick_name as manager_nick_name, c.manager_time from cmc_contract as c
         left join sys_user as u on u.user_id = c.drafter
+        left join sys_user as u1 on u1.user_id = c.manager_user_id
     </sql>
 
     <select id="selectCmcContractList" parameterType="CmcContract" resultMap="CmcContractResult">
@@ -72,6 +82,9 @@
             <if test="signRemark != null">sign_remark,</if>
             <if test="signScan != null">sign_scan,</if>
             <if test="commentType != null">comment_type,</if>
+            <if test="managerComment != null">manager_comment,</if>
+            <if test="managerUserId != null">manager_user_id,</if>
+            <if test="managerTime != null">manager_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="contractId != null">#{contractId},</if>
@@ -87,6 +100,9 @@
             <if test="signRemark != null">#{signRemark},</if>
             <if test="signScan != null">#{signScan},</if>
             <if test="commentType != null">#{commentType},</if>
+            <if test="managerComment != null">#{managerComment},</if>
+            <if test="managerUserId != null">#{managerUserId},</if>
+            <if test="managerTime != null">#{managerTime},</if>
         </trim>
     </insert>
 
@@ -105,6 +121,9 @@
             <if test="signRemark != null">sign_remark = #{signRemark},</if>
             <if test="signScan != null">sign_scan = #{signScan},</if>
             <if test="commentType != null">comment_type = #{commentType},</if>
+            <if test="managerComment != null">manager_comment = #{managerComment},</if>
+            <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
+            <if test="managerTime != null">manager_time = #{managerTime},</if>
         </trim>
         where contract_id = #{contractId}
     </update>

oa-ui/src/api/oa/contract/contractMeeting.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc合同会审列表
+export function listContractMeeting(query) {
+  return request({
+    url: '/oa/contractMeeting/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc合同会审详细
+export function getContractMeeting(meetingId) {
+  return request({
+    url: '/oa/contractMeeting/' + meetingId,
+    method: 'get'
+  })
+}
+
+// 新增cmc合同会审
+export function addContractMeeting(data) {
+  return request({
+    url: '/oa/contractMeeting',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc合同会审
+export function updateContractMeeting(data) {
+  return request({
+    url: '/oa/contractMeeting',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc合同会审
+export function delContractMeeting(meetingId) {
+  return request({
+    url: '/oa/contractMeeting/' + meetingId,
+    method: 'delete'
+  })
+}

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

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="18" :xs="24">
-        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <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>
@@ -49,10 +49,99 @@
           <el-form-item label="合同文件" prop="contractDocument">
             <el-input v-model="form.contractDocument" placeholder="请输入合同文件" />
           </el-form-item>
+          <el-form-item label="合同计划工作量：">
+            <table border="1">
+              <tr>
+                <td>序号</td>
+                <td>工作内容</td>
+                <td>等级或比例尺</td>
+                <td>单位</td>
+                <td>工作量</td>
+                <td>要求完成时间</td>
+                <td>备注</td>
+              </tr>
+              <tr v-for="(work, index) in workList" :key="index">
+                <td>
+                  {{ index + 1 }}
+                </td>
+                <td>
+                  <el-input v-model="work.content" type="textarea" clearable
+                    :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
+                </td>
+                <td>
+                  <el-input v-model="work.scale" clearable></el-input>
+                </td>
+                <td>
+                  <el-input v-model="work.unit" clearable></el-input>
+                </td>
+                <td>
+                  <el-input v-model="work.workload" clearable></el-input>
+                </td>
+                <td>
+                  <el-date-picker style="width: 140px" v-model="work.deadline" value-format="yyyy-MM-dd" type="date"
+                    placeholder="选择日期">
+                  </el-date-picker>
+                </td>
+                <td>
+                  <el-input v-model="work.remark" type="textarea" clearable
+                    :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
+                </td>
+                <td>
+                  <el-button type="danger" icon="el-icon-minus" size="mini" circle
+                    @click="deletWorkItem(index)"></el-button>
+                </td>
+              </tr>
+            </table>
+            <el-button icon="el-icon-plus" size="mini" @click="addWorkList()" type="primary" plain></el-button>
+          </el-form-item>
+          <el-form-item label="合同回款计划：">
+            <table border="1">
+              <tr>
+                <td>序号</td>
+                <td>回款条件</td>
+                <td>回款比例（%）</td>
+                <td>回款金额（元）</td>
+                <td>预计时间</td>
+                <td>备注</td>
+              </tr>
+              <tr v-for="(payment, index) in paymentList" :key="index">
+                <td>
+                  {{ index + 1 }}
+                </td>
+                <td>
+                  <el-input v-model="payment.paymentCondition" type="textarea" clearable
+                    :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
+                </td>
+                <td>
+                  <el-input v-model="payment.paymentPercentage" clearable></el-input>
+                </td>
+                <td>
+                  <el-input v-model="payment.paymentAmount" clearable></el-input>
+                </td>
+                <td>
+                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd" type="date"
+                    placeholder="选择日期">
+                  </el-date-picker>
+                </td>
+                <td>
+                  <el-input v-model="payment.remark" type="textarea" clearable
+                    :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
+                </td>
+                <td>
+                  <el-button type="danger" icon="el-icon-minus" size="mini" circle
+                    @click="deletPaymentItem(index)"></el-button>
+                </td>
+              </tr>
+            </table>
+            <el-button icon="el-icon-plus" size="mini" @click="addPaymentList()" type="primary" plain></el-button>
+          </el-form-item>
+          <el-form-item label="合同备注" prop="remark">
+            <el-input v-model="form.remark" placeholder="请输入合同备注" />
+          </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
               <el-form-item label="拟稿人：" label-width="120px">
-                <span class="auditor"> {{ form.draftUser ? form.draftUser.nickName : drafter }} </span>
+                <span class="auditor"> {{ form.draftUser ? form.draftUser.nickName : draftUser }} </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -61,9 +150,133 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-form-item label="合同备注" prop="remark">
-            <el-input v-model="form.remark" placeholder="请输入合同备注" />
+          <el-divider></el-divider>
+          <el-form-item label="评审方式" prop="commentType">
+            <el-radio-group v-model="form.commentType" @change="changeCommentType">
+              <el-radio :label="0">无须评审</el-radio>
+              <el-radio :label="1">会议评审</el-radio>
+              <el-radio :label="2">线上评审</el-radio>
+            </el-radio-group>
           </el-form-item>
+          <el-form-item label="线上评审：" v-if="commentOpen">
+            <table border="1">
+              <tr>
+                <td>序号</td>
+                <td>会审部门</td>
+                <td>会审人</td>
+                <td>会审意见</td>
+                <td>会审附件</td>
+                <td>签名</td>
+                <td>日期</td>
+              </tr>
+              <tr v-for="(comment, index) in commentList" :key="index">
+                <td>
+                  {{ index + 1 }}
+                </td>
+                <td>
+                  <el-select v-model="comment.deptId" clearable style="width:120px" :disabled="index < 4" @change="getDeptLeader">
+                    <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
+                    </el-option>
+                  </el-select>
+                </td>
+                <td>
+                  <el-select v-model="comment.userId" clearable style="width:120px" :disabled="index < 4">
+                    <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
+                    </el-option>
+                  </el-select>
+                </td>
+                <td>
+                  <el-input v-model="comment.comment" type="textarea" clearable
+                    :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
+                </td>
+                <td>
+                  <el-input v-model="comment.document" clearable></el-input>
+                </td>
+                <td>
+                  <span class="auditor"> {{ comment.User ? comment.User.nickName : commentUser }} </span>
+                </td>
+                <td>
+                  <span> {{ form.commentTime ? form.commentTime : commentTime }} </span>
+                </td>
+                <td>
+                  <el-button type="danger" icon="el-icon-minus" size="mini" circle
+                    @click="deletCommentItem(index)"></el-button>
+                </td>
+              </tr>
+            </table>
+            <el-button icon="el-icon-plus" size="mini" @click="addCommentList()" type="primary" plain></el-button>
+          </el-form-item>
+          <el-form-item label="会议评审：" v-if="meetingOpen">
+            <table border="1">
+              <tr>
+                <td>评审时间</td>
+                <td>
+                  <el-date-picker clearable v-model="meetingForm.meetingTime" type="date" value-format="yyyy-MM-dd"
+                    placeholder="请选择评审日期">
+                  </el-date-picker>
+                </td>
+                <td>评审地点</td>
+                <td>
+                  <el-select v-model="meetingForm.place" clearable style="width:120px">
+                    <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-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
+                    </el-option>
+                  </el-select>
+                </td>
+              </tr>
+              <tr>
+                <td>参与评审人员</td>
+                <td colspan="5">
+                  <el-select v-model="meetingForm.users" multiple clearable style="width:600px">
+                    <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
+                    </el-option>
+                  </el-select>
+                </td>
+              </tr>
+              <tr>
+                <td>评审意见表</td>
+                <td colspan="5">
+                  <el-input v-model="meetingForm.document" clearable></el-input>
+                </td>
+              </tr>
+              <tr>
+                <td>评审结论</td>
+                <td colspan="5">
+                  <el-input type="textarea" v-model="meetingForm.conclusion" clearable></el-input>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <span class="auditor"> {{ meetingForm.User ? meetingForm.User.nickName : meetingUser }} </span>
+                </td>
+                <td>
+                  <span> {{ meetingForm.commentTime ? meetingForm.commentTime : commentTime }} </span>
+                </td>
+              </tr>
+            </table>
+          </el-form-item>
+          <el-form-item label="分管审批意见" prop="remark">
+            <el-input v-model="form.managerComment" placeholder="请输入分管审批意见" />
+          </el-form-item>
+          <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+              <el-form-item label="签名：" label-width="120px">
+                <span class="auditor"> {{ form.managerUser ? form.managerUser.nickName : managerUser }} </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期：" label-width="120px">
+                <span> {{ form.managerTime ? form.managerTime : managerTime }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-divider></el-divider>
           <el-form-item label="签订日期" prop="signDate">
             <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期">
             </el-date-picker>
@@ -94,11 +307,16 @@
 
 <script>
 import { parseTime } from "@/utils/ruoyi";
+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 } from "@/api/oa/contract/contractWork";
+import { getContractPayment } from "@/api/oa/contract/contractPayment";
+import { getContractComment } from "@/api/oa/contract/contractComment";
+import { getContractMeeting } from "@/api/oa/contract/contractMeeting";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
 import { listTender, getTender } from "@/api/oa/tender/tender";
-import { getUsersDeptLeader, getUsersManageLeader } from '@/api/system/post.js'
+import { getUsersDeptLeader, getUsersManageLeader, getUsersDeptLeaderByDept } from '@/api/system/post.js'
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 export default {
@@ -118,8 +336,12 @@ export default {
   name: "Contract",
   data() {
     return {
-      drafter: '',
+      draftUser: '',
       draftTime: undefined,
+      managerUser: '',
+      managerTime: undefined,
+      commentUser: '',
+      commentTime: undefined,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -155,11 +377,49 @@ export default {
       },
       // 表单参数
       form: {},
+      meetingForm: {},
       // 表单校验
       rules: {
       },
+      meetingOpen: false,
+      commentOpen: false,
+      deptList: [],
+      userList: [],
       workList: [],
+      paymentList: [],
+      placeList: [{ id: 0, name: '301会议室' }, { id: 1, name: '216会议室' }],
+      commentList: [
+        {
+          deptId: 105,
+          userId: '',
+          comment: '',
+          document: '',
+          commentTime: undefined
+        },
+        {
+          deptId: 110,
+          userId: '',
+          comment: '',
+          document: '',
+          commentTime: undefined
+        },
+        {
+          deptId: 107,
+          userId: '',
+          comment: '',
+          document: '',
+          commentTime: undefined
+        },
+        {
+          deptId: 106,
+          userId: '',
+          comment: '',
+          document: '',
+          commentTime: undefined
+        },
+      ],
       tenderList: [],
+      commentType: '',
       chooseTender: {},
       isSelect: false,
       formTotal: 0,
@@ -168,10 +428,16 @@ export default {
   },
   created() {
     if (this.taskName == '合同拟稿') {
-      this.drafter = this.$store.getters.name;
+      this.draftUser = this.$store.getters.name;
       this.draftTime = 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.getDeptList();
     this.getTenderList();
+    this.getUserList();
     this.getList();
     flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
       this.flowData = res.data;
@@ -182,9 +448,6 @@ export default {
   },
   methods: {
     initForm() {
-      getContractWork(this.taskForm.formId).then(res => {
-        this.workList = res.data;
-      });
       getContract(this.taskForm.formId).then(res => {
         if (this.isEmptyObject(res.data)) {
           this.formTotal = 0;
@@ -199,6 +462,22 @@ export default {
               this.isSelect = true
             })
           }
+          getContractWork(this.taskForm.formId).then(res => {
+            if (res.data)
+              this.workList = res.data;
+          });
+          getContractPayment(this.taskForm.formId).then(res => {
+            if (res.data)
+              this.paymentList = res.data;
+          });
+          getContractComment(this.taskForm.formId).then(res => {
+            if (res.data)
+              this.commentList = res.data;
+          });
+          getContractMeeting(this.taskForm.formId).then(res => {
+            if (res.data)
+              this.meetingForm = res.data;
+          });
         }
       })
     },
@@ -211,6 +490,16 @@ export default {
         this.loading = false;
       });
     },
+    getUserList() {
+      listUser({ pageSize: 9999, pageNum: 1 }).then(res => {
+        this.userList = res.rows
+      })
+    },
+    getDeptList() {
+      listDept({ pageSize: 9999, pageNum: 1 }).then(res => {
+        this.deptList = res.data
+      })
+    },
     // 查询项目列表
     getTenderList() {
       this.loading = true
@@ -283,6 +572,88 @@ export default {
         fullNumber = number;
       return fullNumber;
     },
+    addWorkList() {
+      this.workList.push({
+        content: "",
+        scale: "",
+        unit: "",
+        workload: "",
+        deadline: undefined,
+        remark: "",
+      });
+    },
+    addPaymentList() {
+      this.paymentList.push({
+        paymentCondition: "",
+        paymentPercentage: "",
+        paymentAmount: "",
+        paymentTime: undefined,
+        remark: "",
+      });
+    },
+    addCommentList() {
+      this.commentList.push({
+        deptId: "",
+        userId: "",
+        comment: "",
+        document: "",
+        commentTime: undefined,
+      });
+    },
+    deletWorkItem(index) {
+      let arr = this.workList;
+      if (arr.length == 1) {
+        return;
+      }
+      if (index >= 0 && index < arr.length) {
+        arr.splice(index, 1);
+      }
+    },
+    deletPaymentItem(index) {
+      let arr = this.paymentList;
+      if (arr.length == 1) {
+        return;
+      }
+      if (index >= 0 && index < arr.length) {
+        arr.splice(index, 1);
+      }
+    },
+    deletCommentItem(index) {
+      let arr = this.commentList;
+      if (arr.length == 1) {
+        return;
+      }
+      if (index >= 0 && index < arr.length) {
+        arr.splice(index, 1);
+      }
+    },
+    changeCommentType(val) {
+      if (val == 0) {
+        this.commentOpen = false;
+        this.meetingOpen = false;
+      }
+      else if (val == 1) {
+        this.commentOpen = false;
+        this.meetingOpen = true;
+      }
+      else if (val == 2) {
+        this.commentOpen = true;
+        this.meetingOpen = false;
+        for (let comment of this.commentList) {
+          getUsersDeptLeaderByDept({ deptId: comment.deptId }).then(res => {
+            comment.userId = res.data.userId;
+          })
+        }
+      }
+    },    
+    getDeptLeader(val) {
+        getUsersDeptLeaderByDept({ deptId: Number(val) }).then(res => {
+          for(let comment of this.commentList) {
+            if (comment.deptId == val)
+              comment.userId = res.data.userId;
+          }
+        })
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -386,6 +757,17 @@ export default {
 </script>
 
 <style>
+table {
+  /*居中*/
+  margin: 0 auto;
+  /*边框*/
+  /* border: 1px solid black; */
+  text-align: center;
+  border-collapse: collapse;
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+}
+
 .auditor {
   font-family: '华文行楷';
   font-size: 20px;