合同查询

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

@@ -224,10 +224,10 @@ public class CmcProject extends BaseEntity
     {
         return partyAId;
     }
-    public void setPartyA(CmcPartyA partyA)
-    {
-        this.partyA = partyA;
-    }
+//    public void setPartyA(CmcPartyA partyA)
+//    {
+//        this.partyA = partyA;
+//    }
 
     public CmcPartyA getPartyA()
     {
@@ -377,28 +377,28 @@ public class CmcProject extends BaseEntity
     {
         return exitTime;
     }
-    public void setProjectLeaderUser(SysUser projectLeaderUser)
-    {
-        this.projectLeaderUser = projectLeaderUser;
-    }
+//    public void setProjectLeaderUser(SysUser projectLeaderUser)
+//    {
+//        this.projectLeaderUser = projectLeaderUser;
+//    }
 
     public SysUser getProjectLeaderUser()
     {
         return projectLeaderUser;
     }
-    public void setProjectRegistrantUser(SysUser projectRegistrantUser)
-    {
-        this.projectRegistrantUser = projectRegistrantUser;
-    }
+//    public void setProjectRegistrantUser(SysUser projectRegistrantUser)
+//    {
+//        this.projectRegistrantUser = projectRegistrantUser;
+//    }
 
     public SysUser getProjectRegistrantUser()
     {
         return projectRegistrantUser;
     }
-    public void setTechnicalDirectorUser(SysUser technicalDirectorUser)
-    {
-        this.technicalDirectorUser = technicalDirectorUser;
-    }
+//    public void setTechnicalDirectorUser(SysUser technicalDirectorUser)
+//    {
+//        this.technicalDirectorUser = technicalDirectorUser;
+//    }
 
     public SysUser getTechnicalDirectorUser()
     {

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

@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCmcSubContractList" parameterType="CmcSubContract" resultMap="CmcSubContractResult">
         <include refid="selectCmcSubContractVo"/>
         <where>
-            <if test="subContractName != null  and subContractName != ''"> and sc.sub_contract_name like concat('%', sc.#{subContractName}, sc.'%')</if>
+            <if test="subContractName != null  and subContractName != ''"> and sc.sub_contract_name like concat('%', #{subContractName}, '%')</if>
             <if test="subAmount != null "> and sc.sub_amount = #{subAmount}</if>
             <if test="partnerId != null  and partnerId != ''"> and sc.partner_id = #{partnerId}</if>
             <if test="contactPerson != null  and contactPerson != ''"> and sc.contact_person = #{contactPerson}</if>

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

@@ -85,6 +85,7 @@
             <if test="techApprovalTime != null "> and t.tech_approval_time = #{techApprovalTime}</if>
             <if test="manageApprovalTime != null "> and t.manage_approval_time = #{manageApprovalTime}</if>
         </where>
+        order by technical_time desc
     </select>
 
     <select id="selectCmcTechnicalByTechnicalId" parameterType="String" resultMap="CmcTechnicalResult">

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-20 10:14:53
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-06-27 13:17:26
 -->
 <template>
   <div class="app-container">
@@ -41,7 +41,7 @@
           <el-row :gutter="20">
             <el-col :span="16" :xs="24">
               <el-form-item label="分包合同名称" prop="subContractName">
-                <el-input v-model="form.subContractName" placeholder="请输入分包合同名称" :disabled="taskName != '合同拟稿'" />
+                <el-input type="textarea" :rows="3" v-model="form.subContractName" placeholder="请输入分包合同名称" :disabled="taskName != '合同拟稿'" />
               </el-form-item>
             </el-col>
             <el-col :span="8" :xs="24">

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

@@ -1,17 +1,21 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-18 09:05:41
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-19 11:03:15
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-06-27 11:21:23
 -->
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="合同名称" prop="contractName">
+        <el-input v-model="queryParams.contractName" placeholder="请输入合同名称" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <el-form-item label="合同编码" prop="contractCode">
         <el-input v-model="queryParams.contractCode" placeholder="请输入合同编码" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="合同编号" prop="contractNumber">
+      <!-- <el-form-item label="合同编号" prop="contractNumber">
         <el-input v-model="queryParams.contractNumber" placeholder="请输入合同编号" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -30,7 +34,7 @@
         <el-date-picker clearable v-model="queryParams.signDate" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择签订日期">
         </el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

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

@@ -1,16 +1,25 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="128px">
+      <el-form-item label="合同名称" prop="subContractName">
+        <el-input v-model="queryParams.subContractName" placeholder="请输入合同名称" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <el-form-item label="承接单位" prop="partnerId">
-        <el-input v-model="queryParams.partnerId" placeholder="请输入承接单位" clearable @keyup.enter.native="handleQuery" />
+        <el-select v-model="queryParams.partnerId" clearable filterable remote reserve-keyword placeholder="请输入承接单位"
+          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
+          <el-option v-for="partner in partnerList" :key="partner.partnerId" :label="partner.partnerName"
+            :value="partner.partnerId">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="拟稿人" prop="drafter">
+      <!-- <el-form-item label="拟稿人" prop="drafter">
         <el-select v-model="queryParams.drafter" filterable clearable @change="handleQuery">
           <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
             :value="item.userId">
           </el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -96,8 +105,7 @@
           <el-input v-model="form.drafter" placeholder="请输入拟稿人" />
         </el-form-item>
         <el-form-item label="拟稿日期" prop="draftTime">
-          <el-date-picker clearable v-model="form.draftTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择拟稿日期">
+          <el-date-picker clearable v-model="form.draftTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择拟稿日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="合同备注" prop="remark">
@@ -128,6 +136,7 @@
 
 <script>
 import { listSubContract, getSubContract, delSubContract, addSubContract, updateSubContract } from "@/api/oa/contract/subContract";
+import { listPartner } from "@/api/oa/partner/partner";
 import subContract from '../../flowable/form/business/subContract.vue';
 
 export default {
@@ -150,6 +159,7 @@ export default {
       total: 0,
       // cmc分包合同评审表格数据
       subContractList: [],
+      partnerList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -194,6 +204,15 @@ export default {
         this.loading = false;
       });
     },
+    remoteMethod(val) {
+      listPartner({
+        pageNum: 1,
+        pageSize: 20, 
+        partnerName: val
+      }).then(res => {
+        this.partnerList = res.rows;
+      })
+    },
     handleView(row) {
       this.openInfo = true;
       this.title = "合同详情";