承包合同数据更新

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

@@ -22,6 +22,10 @@ public class CmcContract extends BaseEntity
     /** 合同id（ht2024w002） */
     private String contractId;
 
+    /** 合同名称 */
+    @Excel(name = "合同名称")
+    private String contractName;
+
     /** 合同编码 */
     @Excel(name = "合同编码")
     private String contractCode;
@@ -37,6 +41,13 @@ public class CmcContract extends BaseEntity
     private String tenderName;
     private CmcTender tender;
 
+    /** 甲方单位 */
+    private String partyAId;
+
+    @Excel(name = "甲方单位")
+    private String partyAName;
+    private CmcPartyA partyA;
+
     /** 合同金额 */
     @Excel(name = "合同金额")
     private BigDecimal amount;
@@ -103,6 +114,15 @@ public class CmcContract extends BaseEntity
     {
         return contractId;
     }
+    public void setContractName(String contractName)
+    {
+        this.contractName = contractName;
+    }
+
+    public String getContractName()
+    {
+        return contractName;
+    }
     public void setContractCode(String contractCode)
     {
         this.contractCode = contractCode;
@@ -140,6 +160,25 @@ public class CmcContract extends BaseEntity
     {
         return tender;
     }
+    public void setPartyAId(String partyAId)
+    {
+        this.partyAId = partyAId;
+    }
+
+    public String getPartyAId()
+    {
+        return partyAId;
+    }
+    public void setPartyA(CmcPartyA partyA)
+    {
+        this.partyA = partyA;
+        this.partyAName = partyA.getPartyAName();
+    }
+
+    public CmcPartyA getPartyA()
+    {
+        return partyA;
+    }
     public void setAmount(BigDecimal amount)
     {
         this.amount = amount;

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

@@ -157,6 +157,10 @@ public class CmcProject extends BaseEntity
     @Excel(name = "项目任务书")
     private String taskDocument;
 
+    /** 项目提交要求 */
+    @Excel(name = "项目提交要求")
+    private String projectRequest;
+
     public void setProjectId(String projectId)
     {
         this.projectId = projectId;
@@ -490,6 +494,15 @@ public class CmcProject extends BaseEntity
     {
         return participates;
     }
+    public void setProjectRequest(String projectRequest)
+    {
+        this.projectRequest = projectRequest;
+    }
+
+    public String getProjectRequest()
+    {
+        return projectRequest;
+    }
 
     @Override
     public String toString() {

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

@@ -6,9 +6,11 @@
 
     <resultMap type="CmcContract" id="CmcContractResult">
         <result property="contractId"    column="contract_id"    />
+        <result property="contractName"    column="contract_name"    />
         <result property="contractCode"    column="contract_code"    />
         <result property="contractNumber"    column="contract_number"    />
         <result property="tenderId"    column="tender_id"    />
+        <result property="partyAId"    column="party_a_id"    />
         <result property="amount"    column="amount"    />
         <result property="deposit"    column="deposit"    />
         <result property="contractDocument"    column="contract_document"    />
@@ -25,6 +27,7 @@
         <association property="draftUser"    javaType="SysUser"         resultMap="DraftUserResult" />
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
         <association property="tender"    javaType="CmcTender"         resultMap="CmcTenderResult" />
+        <association property="partyA"    javaType="CmcPartyA"         resultMap="CmcPartyAResult" />
     </resultMap>
 
     <resultMap type="CmcTender" id="CmcTenderResult">
@@ -48,20 +51,27 @@
         <result property="nickName"    column="manager_nick_name"    />
     </resultMap>
 
+    <resultMap type="CmcPartyA" id="CmcPartyAResult">
+        <result property="partyAId"    column="party_a_id"    />
+        <result property="partyAName"    column="party_a_name"    />
+    </resultMap>
+
     <sql id="selectCmcContractVo">
-        select c.contract_id, c.contract_code, c.contract_number, c.tender_id, t.project_name as project_name, t.party_a_id as party_a_id, t.a_person as a_person,
+        select c.contract_id, c.contract_code, c.contract_name, c.contract_number, c.tender_id, c.party_a_id, pa.party_a_name, t.project_name as project_name, t.party_a_id as party_a_id, t.a_person as a_person,
                t.a_phone as a_phone, t.agent as agent, t.agent_person as agent_person, t.agent_phone as agent_phone, 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, 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
         left join cmc_tender as t on t.tender_id = c.tender_id
+        left join cmc_party_a as pa on pa.party_a_id = c.party_a_id
     </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="contractName!= null  and contractName != ''"> and c.contract_name like concat('%', #{contractName}, '%')</if>
             <if test="contractCode!= null  and contractCode != ''"> and c.contract_code like concat('%', #{contractCode}, '%')</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>
@@ -87,8 +97,10 @@
         insert into cmc_contract
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="contractId != null">contract_id,</if>
+            <if test="contractName != null">contract_name,</if>
             <if test="contractCode != null">contract_code,</if>
             <if test="tenderId != null">tender_id,</if>
+            <if test="partyAId != null">party_a_id,</if>
             <if test="contractNumber != null">contract_number,</if>
             <if test="amount != null">amount,</if>
             <if test="deposit != null">deposit,</if>
@@ -106,8 +118,10 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="contractId != null">#{contractId},</if>
+            <if test="contractName != null">#{contractName},</if>
             <if test="contractCode != null">#{contractCode},</if>
             <if test="tenderId != null">#{tenderId},</if>
+            <if test="partyAId != null">#{partyAId},</if>
             <if test="contractNumber != null">#{contractNumber},</if>
             <if test="amount != null">#{amount},</if>
             <if test="deposit != null">#{deposit},</if>
@@ -129,7 +143,9 @@
         update cmc_contract
         <trim prefix="SET" suffixOverrides=",">
             <if test="contractCode != null">contract_code = #{contractCode},</if>
+            <if test="contractName != null">contract_name = #{contractName},</if>
             <if test="tenderId != null">tender_id = #{tenderId},</if>
+            <if test="partyAId != null">party_a_id = #{partyAId},</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/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml

@@ -37,6 +37,7 @@
         <result property="devices"    column="devices"    />
         <result property="participates"    column="participates"    />
         <result property="taskDocument"    column="task_document"    />
+        <result property="projectRequest"    column="project_request"    />
         <association property="projectLeaderUser"    javaType="SysUser"         resultMap="ProjectLeaderResult" />
         <association property="projectRegistrantUser"    javaType="SysUser"         resultMap="ProjectRegistrantResult" />
         <association property="technicalDirectorUser"    javaType="SysUser"         resultMap="TechnicalDirectorResult" />
@@ -66,7 +67,8 @@
     <sql id="selectCmcProjectVo">
         select p.project_id, p.project_number, p.project_name, p.project_leader, u.nick_name as leader_nick_name, p.is_finished, p.project_source, p.party_a_id, pa.party_a_name, p.contact_person, p.telephone,
                p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.organize_document, p.organize_time,
-               p.register_time, p.plan_time, p.entry_time, p.exit_time, p.remark, c.technical_director, u2.nick_name as director_nick_name, c.quality_inspector, p.project_kml, p.project_cp, p.kml_lng, p.kml_lat, p.cars, p.drivers, p.devices, p.participates, p.task_document from cmc_project as p
+               p.register_time, p.plan_time, p.entry_time, p.exit_time, p.remark, c.technical_director, u2.nick_name as director_nick_name, c.quality_inspector, p.project_kml, p.project_cp, p.kml_lng, p.kml_lat,
+               p.cars, p.drivers, p.devices, p.participates, p.task_document, p.project_request from cmc_project as p
         left join sys_user as u on u.user_id = p.project_leader
         left join sys_user as u1 on u1.user_id = p.project_registrant
         left join cmc_technical as c on c.project_id = p.project_id
@@ -142,6 +144,7 @@
             <if test="devices != null">devices,</if>
             <if test="participates != null">participates,</if>
             <if test="taskDocument != null">task_document,</if>
+            <if test="projectRequest != null">project_request,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectId != null">#{projectId},</if>
@@ -175,6 +178,7 @@
             <if test="devices != null">#{devices},</if>
             <if test="participates != null">#{participates},</if>
             <if test="taskDocument != null">#{taskDocument},</if>
+            <if test="projectRequest != null">#{projectRequest},</if>
         </trim>
     </insert>
 
@@ -211,6 +215,7 @@
             <if test="devices != null">devices = #{devices},</if>
             <if test="participates != null">participates = #{participates},</if>
             <if test="taskDocument != null">task_document = #{taskDocument},</if>
+            <if test="projectRequest != null">project_request = #{projectRequest},</if>
         </trim>
         where project_id = #{projectId}
     </update>

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-14 19:07:59
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-06-18 11:15:07
 -->
 <template>
   <div class="app-container">
@@ -14,22 +14,30 @@
           <el-row :gutter="20">
             <el-col :span="12" :xs="24">
               <el-form-item label="投标项目名称：" prop="tenderId">
-                <el-button type="primary" size="mini" @click="tbOpen = true"
-                  v-if="taskName == '合同拟稿'">选择投标项目</el-button>
-                <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-button type="primary" size="mini" @click="tbOpen = true" v-if="taskName == '合同拟稿'">选择投标项目</el-button>
+                <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="3" direction="vertical">
+                  <el-descriptions-item label="投标项目名称" label-class-name="my-label" :span="3">{{ 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 ?
-      chooseTender.partyA.partyAName : ''
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="联系人" label-class-name="my-label">{{ chooseTender.aPerson
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="联系电话" label-class-name="my-label">{{ chooseTender.aPhone
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                 </el-descriptions>
               </el-form-item>
+              <el-form-item label="合同名称" prop="contractName">
+                <el-input type="textarea" :rows="3" style="width: 100%;" v-model="form.contractName" placeholder="请输入合同名称"
+                  :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-option v-for="item in partyAList" :key="item.value" :label="item.partyAName" :value="item.partyAId"
+                    :disabled="taskName != '合同拟稿'">
+                  </el-option>
+                </el-select>
+              </el-form-item>
               <el-form-item label="合同编码" prop="contractCode">
                 <el-input style="width: 100%;" v-model="form.contractCode" placeholder="请输入合同编码"
                   :disabled="taskName != '合同拟稿'"></el-input>
@@ -39,8 +47,7 @@
                   :disabled="taskName != '合同拟稿'"></el-input>
               </el-form-item>
               <el-form-item label="合同金额" prop="amount">
-                <el-input style="width:100%;" v-model="form.amount" placeholder="请输入合同金额"
-                  :disabled="taskName != '合同拟稿'">
+                <el-input style="width:100%;" v-model="form.amount" placeholder="请输入合同金额" :disabled="taskName != '合同拟稿'">
                   <template slot="append">元</template>
                 </el-input>
               </el-form-item>
@@ -161,8 +168,8 @@
                     clearable :disabled="taskName != '合同拟稿'"></el-input-number>
                 </td>
                 <td>
-                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd"
-                    type="date" placeholder="选择日期" :disabled="taskName != '合同拟稿'">
+                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd" type="date"
+                    placeholder="选择日期" :disabled="taskName != '合同拟稿'">
                   </el-date-picker>
                 </td>
                 <td>
@@ -364,8 +371,8 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="签订日期" prop="signDate">
-            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择签订日期" :disabled="taskName != '合同签订'">
+            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期"
+              :disabled="taskName != '合同签订'">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="签订备注" prop="signRemark">
@@ -445,6 +452,7 @@ import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import ChooseProject from '../components/chooseProject.vue';
 import ChooseTender from '../components/chooseTender.vue';
+import { listPartyA } from "@/api/oa/partyA/partyA";
 import FileItem from './fileItem.vue';
 import { mapGetters } from "vuex";
 export default {
@@ -522,6 +530,7 @@ export default {
       meetingOpen: false,
       commentOpen: false,
       chooseProjectList: [],
+      partyAList: [],
       projectList: [],
       deptList: [],
       userList: [],
@@ -594,6 +603,7 @@ export default {
       this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
     this.getProjectList();
+    this.getPartyAList();
     this.getDeptList();
     this.getTenderList();
     this.getUserList();
@@ -747,6 +757,16 @@ export default {
         }
       })
     },
+    // 查询业主单位列表
+    getPartyAList() {
+      this.loading = true
+      listPartyA({
+        pageNum: 1,
+        pageSize: 99999999
+      }).then(response => {
+        this.partyAList = response.rows;
+      })
+    },
     // 查询项目列表
     getProjectList() {
       this.loading = true
@@ -1129,6 +1149,7 @@ export default {
       this.form.tenderId = val.tenderId
       this.chooseTender = val
       this.isSelect = true
+      this.form.partyAId = val.partyAId
     },
     calculatePaymentAmount(payment) {
       let amount = (payment.paymentPercentage / 100) * this.form.amount

oa-ui/src/views/oa/staff/salary.vue

@@ -165,7 +165,7 @@ export default {
         for (let salary of response.rows) {
           data.push([Number(salary.postLevel) + 1, Number(salary.salaryLevel) + 1, salary.salary]);
         }
-        var salarys = ['', '一档', '二档', '三档', '四档', '五档', '六档', '七档', '八档'];
+        var salarys = ['', '一级', '二级', '三级', '四级', '五级', '六级', '七级', '八级'];
         var posts = ['', '一岗', '二岗', '三岗', '四岗', '五岗', '六岗', '七岗', '八岗'];
         this.option = {
           tooltip: {},