导出投标项目表

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

@@ -3,6 +3,8 @@ package com.ruoyi.oa.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysDept;
+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;
@@ -54,11 +56,9 @@ public class CmcTender extends BaseEntity
     private String place;
 
     /** 投标部门 */
-    @Excel(name = "投标部门")
     private Long dept;
 
     /** 投标委托人 */
-    @Excel(name = "投标委托人")
     private Long trustee;
 
     /** 业主预算 */
@@ -96,7 +96,6 @@ public class CmcTender extends BaseEntity
     private String projectBriefly;
 
     /** 商务标书编写人 */
-    @Excel(name = "商务标书编写人")
     private Long businessWriter;
 
     /** 商务标书要求提交时间 */
@@ -105,7 +104,6 @@ public class CmcTender extends BaseEntity
     private Date businessDeadline;
 
     /** 技术标书编写人 */
-    @Excel(name = "技术标书编写人")
     private Long techWriter;
 
     /** 技术标书要求提交时间 */
@@ -114,21 +112,46 @@ public class CmcTender extends BaseEntity
     private Date techDeadline;
 
     /** 标书合稿人 */
-    @Excel(name = "标书合稿人")
     private Long tenderCombiner;
 
     /** 标书检查人 */
-    @Excel(name = "标书检查人")
     private Long tenderChecker;
 
     /** 标书打印装订人 */
-    @Excel(name = "标书打印装订人")
     private Long tenderPrinter;
 
     /** 标书文件 */
     @Excel(name = "标书文件")
     private String tenderDocument;
 
+    @Excel(name = "投标委托人")
+    private String trusteeUserName;
+    private SysUser trusteeUser;
+
+    @Excel(name = "商务标书编写人")
+    private String businessUserName;
+    private SysUser businessUser;
+
+    @Excel(name = "技术标书编写人")
+    private String techUserName;
+    private SysUser techUser;
+
+    @Excel(name = "标书合稿人")
+    private String combinerUserName;
+    private SysUser combinerUser;
+
+    @Excel(name = "标书检查人")
+    private String checkerUserName;
+    private SysUser checkerUser;
+
+    @Excel(name = "标书打印装订人")
+    private String printerUserName;
+    private SysUser printerUser;
+
+    @Excel(name = "投标部门")
+    private String tenderDeptName;
+    private SysDept tenderDept;
+
     public void setTenderId(String tenderId) 
     {
         this.tenderId = tenderId;
@@ -372,6 +395,77 @@ public class CmcTender extends BaseEntity
     {
         return tenderDocument;
     }
+    public void setBusinessUser(SysUser businessUser)
+    {
+        this.businessUser = businessUser;
+        this.businessUserName = businessUser.getNickName();
+    }
+
+    public SysUser getBusinessUser()
+    {
+        return businessUser;
+    }
+    public void setTechUser(SysUser techUser)
+    {
+        this.techUser = techUser;
+        this.techUserName = techUser.getNickName();
+    }
+
+    public SysUser getTechUser()
+    {
+        return techUser;
+    }
+    public void setCombinerUser(SysUser combinerUser)
+    {
+        this.combinerUser = combinerUser;
+        this.combinerUserName = combinerUser.getNickName();
+    }
+
+    public SysUser getCombinerUser()
+    {
+        return combinerUser;
+    }
+    public void setCheckerUser(SysUser checkerUser)
+    {
+        this.checkerUser = checkerUser;
+        this.checkerUserName = checkerUser.getNickName();
+    }
+
+    public SysUser getCheckerUser()
+    {
+        return checkerUser;
+    }
+    public void setPrinterUser(SysUser printerUser)
+    {
+        this.printerUser = printerUser;
+        this.printerUserName = printerUser.getNickName();
+    }
+
+    public SysUser getPrinterUser()
+    {
+        return printerUser;
+    }
+    public void setTrusteeUser(SysUser trusteeUser)
+    {
+        this.trusteeUser = trusteeUser;
+        this.trusteeUserName = trusteeUser.getNickName();
+    }
+
+    public SysUser getTrusteeUser()
+    {
+        return trusteeUser;
+    }
+    public void setTenderDept(SysDept tenderDept)
+    {
+        this.tenderDept = tenderDept;
+        this.tenderDeptName = tenderDept.getDeptName();
+    }
+
+    public SysDept getTenderDept()
+    {
+        return tenderDept;
+    }
+
 
     @Override
     public String toString() {

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

@@ -23,8 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCmcPriceList" parameterType="CmcPrice" resultMap="CmcPriceResult">
         <include refid="selectCmcPriceVo"/>
         <where>  
-            <if test="workType != null  and workType != ''"> and work_type = #{workType}</if>
-            <if test="workItem != null  and workItem != ''"> and work_item = #{workItem}</if>
+            <if test="workType != null  and workType != ''"> and work_type like concat('%', #{workType}, '%')</if>
+            <if test="workItem != null  and workItem != ''"> and work_item like concat('%', #{workItem}, '%')</if>
             <if test="subItem != null  and subItem != ''"> and sub_item = #{subItem}</if>
             <if test="pricePercentage != null  and pricePercentage != ''"> and price_percentage = #{pricePercentage}</if>
             <if test="scaleGrade != null  and scaleGrade != ''"> and scale_grade = #{scaleGrade}</if>

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

@@ -32,47 +32,99 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="tenderChecker"    column="tender_checker"    />
         <result property="tenderPrinter"    column="tender_printer"    />
         <result property="tenderDocument"    column="tender_document"    />
+        <association property="trusteeUser"    javaType="SysUser"         resultMap="TrusteeUserResult" />
+        <association property="businessUser"    javaType="SysUser"         resultMap="BusinessUserResult" />
+        <association property="techUser"    javaType="SysUser"         resultMap="TechUserResult" />
+        <association property="combinerUser"    javaType="SysUser"         resultMap="CombinerUserResult" />
+        <association property="checkerUser"    javaType="SysUser"         resultMap="CheckerUserResult" />
+        <association property="printerUser"    javaType="SysUser"         resultMap="PrinterUserResult" />
+        <association property="tenderDept"    javaType="SysDept"         resultMap="SysDeptResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="TrusteeUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="trustee_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="BusinessUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="business_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="TechUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="tech_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="CombinerUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="combiner_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="CheckerUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="checker_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="PrinterUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="printer_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysDept" id="SysDeptResult">
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
     </resultMap>
 
     <sql id="selectCmcTenderVo">
-        select tender_id, project_name, party_a, a_person, a_phone, agent, agent_person, agent_phone, place, dept, trustee, budget, quote, deposit, tender_time, bid_buy_deadline, bid_website, bid_document, project_briefly, business_writer, business_deadline, tech_writer, tech_deadline, tender_combiner, tender_checker, tender_printer, tender_document from cmc_tender
+        select t.tender_id, t.project_name, t.party_a, t.a_person, t.a_phone, t.agent, t.agent_person, t.agent_phone, t.place, t.dept, t.trustee, t.budget, t.quote, t.deposit, t.tender_time,
+               t.bid_buy_deadline, t.bid_website, t.bid_document, t.project_briefly, t.business_writer, t.business_deadline, t.tech_writer, t.tech_deadline, t.tender_combiner, t.tender_checker,
+               t.tender_printer, t.tender_document, u.nick_name as trustee_nick_name, u1.nick_name as business_nick_name, u2.nick_name as tech_nick_name, u3.nick_name as combiner_nick_name,
+               u4.nick_name as checker_nick_name, u5.nick_name as printer_nick_name, d.dept_name from cmc_tender as t
+        left join sys_user as u on u.user_id = t.trustee
+        left join sys_user as u1 on u1.user_id = t.business_writer
+        left join sys_user as u2 on u2.user_id = t.tech_writer
+        left join sys_user as u3 on u3.user_id = t.tender_combiner
+        left join sys_user as u4 on u4.user_id = t.tender_checker
+        left join sys_user as u5 on u5.user_id = t.tender_printer
+        left join sys_dept as d on d.dept_id = t.dept
     </sql>
 
     <select id="selectCmcTenderList" parameterType="CmcTender" resultMap="CmcTenderResult">
         <include refid="selectCmcTenderVo"/>
         <where>  
-            <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
-            <if test="partyA != null  and partyA != ''"> and party_a like concat('%', #{partyA}, '%')</if>
-            <if test="aPerson != null  and aPerson != ''"> and a_person like concat('%', #{aPerson}, '%')</if>
-            <if test="aPhone != null  and aPhone != ''"> and a_phone like concat('%', #{aPhone}, '%')</if>
-            <if test="agent != null  and agent != ''"> and agent like concat('%', #{agent}, '%')</if>
-            <if test="agentPerson != null  and agentPerson != ''"> and agent_person like concat('%', #{agentPerson}, '%')</if>
-            <if test="agentPhone != null  and agentPhone != ''"> and agent_phone like concat('%', #{agentPhone}, '%')</if>
-            <if test="place != null  and place != ''"> and place like concat('%', #{place}, '%')</if>
-            <if test="dept != null "> and dept = #{dept}</if>
-            <if test="trustee != null "> and trustee = #{trustee}</if>
-            <if test="budget != null "> and budget = #{budget}</if>
-            <if test="quote != null "> and quote = #{quote}</if>
-            <if test="deposit != null "> and deposit = #{deposit}</if>
-            <if test="tenderTime != null "> and tender_time = #{tenderTime}</if>
-            <if test="bidBuyDeadline != null "> and bid_buy_deadline = #{bidBuyDeadline}</if>
-            <if test="bidWebsite != null  and bidWebsite != ''"> and bid_website = #{bidWebsite}</if>
-            <if test="bidDocument != null  and bidDocument != ''"> and bid_document = #{bidDocument}</if>
-            <if test="projectBriefly != null  and projectBriefly != ''"> and project_briefly = #{projectBriefly}</if>
-            <if test="businessWriter != null "> and business_writer = #{businessWriter}</if>
-            <if test="businessDeadline != null "> and business_deadline = #{businessDeadline}</if>
-            <if test="techWriter != null "> and tech_writer = #{techWriter}</if>
-            <if test="techDeadline != null "> and tech_deadline = #{techDeadline}</if>
-            <if test="tenderCombiner != null "> and tender_combiner = #{tenderCombiner}</if>
-            <if test="tenderChecker != null "> and tender_checker = #{tenderChecker}</if>
-            <if test="tenderPrinter != null "> and tender_printer = #{tenderPrinter}</if>
-            <if test="tenderDocument != null  and tenderDocument != ''"> and tender_document = #{tenderDocument}</if>
+            <if test="projectName != null  and projectName != ''"> and t.project_name like concat('%', #{projectName}, '%')</if>
+            <if test="partyA != null  and partyA != ''"> and t.party_a like concat('%', #{partyA}, '%')</if>
+            <if test="aPerson != null  and aPerson != ''"> and t.a_person like concat('%', #{aPerson}, '%')</if>
+            <if test="aPhone != null  and aPhone != ''"> and t.a_phone like concat('%', #{aPhone}, '%')</if>
+            <if test="agent != null  and agent != ''"> and t.agent like concat('%', #{agent}, '%')</if>
+            <if test="agentPerson != null  and agentPerson != ''"> and t.agent_person like concat('%', #{agentPerson}, '%')</if>
+            <if test="agentPhone != null  and agentPhone != ''"> and t.agent_phone like concat('%', #{agentPhone}, '%')</if>
+            <if test="place != null  and place != ''"> and t.place like concat('%', #{place}, '%')</if>
+            <if test="dept != null "> and t.dept = #{dept}</if>
+            <if test="trustee != null "> and t.trustee = #{trustee}</if>
+            <if test="budget != null "> and t.budget = #{budget}</if>
+            <if test="quote != null "> and t.quote = #{quote}</if>
+            <if test="deposit != null "> and t.deposit = #{deposit}</if>
+            <if test="tenderTime != null "> and t.tender_time = #{tenderTime}</if>
+            <if test="bidBuyDeadline != null "> and t.bid_buy_deadline = #{bidBuyDeadline}</if>
+            <if test="bidWebsite != null  and bidWebsite != ''"> and t.bid_website = #{bidWebsite}</if>
+            <if test="bidDocument != null  and bidDocument != ''"> and t.bid_document = #{bidDocument}</if>
+            <if test="projectBriefly != null  and projectBriefly != ''"> and t.project_briefly = #{projectBriefly}</if>
+            <if test="businessWriter != null "> and t.business_writer = #{businessWriter}</if>
+            <if test="businessDeadline != null "> and t.business_deadline = #{businessDeadline}</if>
+            <if test="techWriter != null "> and t.tech_writer = #{techWriter}</if>
+            <if test="techDeadline != null "> and t.tech_deadline = #{techDeadline}</if>
+            <if test="tenderCombiner != null "> and t.tender_combiner = #{tenderCombiner}</if>
+            <if test="tenderChecker != null "> and t.tender_checker = #{tenderChecker}</if>
+            <if test="tenderPrinter != null "> and t.tender_printer = #{tenderPrinter}</if>
+            <if test="tenderDocument != null  and tenderDocument != ''"> and t.tender_document = #{tenderDocument}</if>
         </where>
     </select>
     
     <select id="selectCmcTenderByTenderId" parameterType="String" resultMap="CmcTenderResult">
         <include refid="selectCmcTenderVo"/>
-        where tender_id = #{tenderId}
+        where t.tender_id = #{tenderId}
     </select>
         
     <insert id="insertCmcTender" parameterType="CmcTender">

oa-back/sql/sql.sql

@@ -335,8 +335,8 @@ create table sys_role (
 insert into sys_role values('1', '超级管理员',  'admin',  1, 1, 1, 1, '0', '0', 'admin', sysdate(), '', null, '超级管理员');
 insert into sys_role values('2', '普通角色',    'common', 2, 2, 1, 1, '0', '0', 'admin', sysdate(), '', null, '普通角色');
 insert into sys_role values('3', '人事管理员',	'staff', 3, 3, 1, 1, '0', '0', 'admin', sysdate(), '', null, '人事管理员');
-insert into sys_role values('4', '车辆管理员',	'car', 4, 4, 1, 1, '0', '0', 'admin', sysdate(), '', null, '车辆管理员');
-insert into sys_role values('5', '设备管理员',	'device', 5, 5, 1, 1, '0', '0', 'admin', sysdate(), '', null, '设备管理员');
+insert into sys_role values('4', '设备管理员',	'device', 4, 4, 1, 1, '0', '0', 'admin', sysdate(), '', null, '设备管理员');
+insert into sys_role values('5', '车辆管理员',	'car', 5, 5, 1, 1, '0', '0', 'admin', sysdate(), '', null, '车辆管理员');
 insert into sys_role values('6', '资料归档员',	'archive', 6, 6, 1, 1, '0', '0', 'admin', sysdate(), '', null, '资料归档员');
 insert into sys_role values('7', '管理层',		'leader', 7, 7, 1, 1, '0', '0', 'admin', sysdate(), '', null, '管理层');
 
@@ -530,15 +530,17 @@ insert into sys_menu values('1095', '资料修改', '11', '3', '#', '', '', 1, 0
 insert into sys_menu values('1096', '资料删除', '11', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:remove',			'#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1097', '资料导出', '11', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:export',			'#', 'admin', sysdate(), '', null, '');
 -- 设备记录按钮
-insert into sys_menu values('1098', '记录新增', '5', '3', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:add',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1099', '记录修改', '5', '4', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:edit',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1100', '记录删除', '5', '5', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:remove',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1101', '记录导出', '5', '6', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:export',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1098', '记录查询', '5', '3', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:query',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1099', '记录新增', '5', '4', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:add',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1100', '记录修改', '5', '5', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:edit',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1101', '记录删除', '5', '6', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:remove',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1102', '记录导出', '5', '7', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:export',			'#', 'admin', sysdate(), '', null, '');
 -- 车辆记录按钮
-insert into sys_menu values('1102', '记录新增', '6', '6', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:add',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1103', '记录修改', '6', '7', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:edit',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1104', '记录删除', '6', '8', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:remove',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1105', '记录导出', '6', '9', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:export',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1103', '记录查询', '6', '6', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:query',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1104', '记录新增', '6', '7', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:add',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1105', '记录修改', '6', '8', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:edit',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1106', '记录删除', '6', '9', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:remove',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1107', '记录导出', '6', '10', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:export',			'#', 'admin', sysdate(), '', null, '');
 
 -- ----------------------------
 -- 6、用户和角色关联表  用户N-1角色
@@ -586,9 +588,9 @@ insert into `sys_user_role` values (15, 2);
 insert into `sys_user_role` values (15, 7);
 insert into `sys_user_role` values (16, 2);
 insert into `sys_user_role` values (17, 2);
-insert into `sys_user_role` values (17, 4);
+insert into `sys_user_role` values (17, 5);
 insert into `sys_user_role` values (18, 2);
-insert into `sys_user_role` values (18, 5);
+insert into `sys_user_role` values (18, 4);
 insert into `sys_user_role` values (19, 2);
 insert into `sys_user_role` values (19, 3);
 insert into `sys_user_role` values (20, 2);
@@ -752,19 +754,29 @@ insert into `sys_role_menu` values (3, 1005);
 insert into `sys_role_menu` values (3, 1006);
 insert into `sys_role_menu` values (3, 1007);
 insert into `sys_role_menu` values (4, 5);
-insert into `sys_role_menu` values (4, 1063);
-insert into `sys_role_menu` values (4, 1064);
-insert into `sys_role_menu` values (4, 1065);
-insert into `sys_role_menu` values (4, 1066);
-insert into `sys_role_menu` values (4, 1067);
+insert into `sys_role_menu` values (4, 120);
+insert into `sys_role_menu` values (4, 121);
+insert into `sys_role_menu` values (4, 1068);
+insert into `sys_role_menu` values (4, 1069);
+insert into `sys_role_menu` values (4, 1070);
+insert into `sys_role_menu` values (4, 1071);
+insert into `sys_role_menu` values (4, 1072);
+insert into `sys_role_menu` values (4, 1098);
+insert into `sys_role_menu` values (4, 1099);
+insert into `sys_role_menu` values (4, 1100);
+insert into `sys_role_menu` values (4, 1101);
+insert into `sys_role_menu` values (4, 1102);
 insert into `sys_role_menu` values (5, 6);
-insert into `sys_role_menu` values (5, 120);
-insert into `sys_role_menu` values (5, 121);
-insert into `sys_role_menu` values (5, 1068);
-insert into `sys_role_menu` values (5, 1069);
-insert into `sys_role_menu` values (5, 1070);
-insert into `sys_role_menu` values (5, 1071);
-insert into `sys_role_menu` values (5, 1072);
+insert into `sys_role_menu` values (5, 1063);
+insert into `sys_role_menu` values (5, 1064);
+insert into `sys_role_menu` values (5, 1065);
+insert into `sys_role_menu` values (5, 1066);
+insert into `sys_role_menu` values (5, 1067);
+insert into `sys_role_menu` values (5, 1103);
+insert into `sys_role_menu` values (5, 1104);
+insert into `sys_role_menu` values (5, 1105);
+insert into `sys_role_menu` values (5, 1106);
+insert into `sys_role_menu` values (5, 1107);
 insert into `sys_role_menu` values (6, 11);
 insert into `sys_role_menu` values (6, 1093);
 insert into `sys_role_menu` values (6, 1094);
@@ -777,6 +789,7 @@ insert into `sys_role_menu` values (7, 6);
 insert into `sys_role_menu` values (7, 7);
 insert into `sys_role_menu` values (7, 8);
 insert into `sys_role_menu` values (7, 9);
+insert into `sys_role_menu` values (7, 10);
 insert into `sys_role_menu` values (7, 118);
 insert into `sys_role_menu` values (7, 119);
 insert into `sys_role_menu` values (7, 120);
@@ -784,17 +797,17 @@ insert into `sys_role_menu` values (7, 121);
 insert into `sys_role_menu` values (7, 1000);
 insert into `sys_role_menu` values (7, 1001);
 insert into `sys_role_menu` values (7, 1063);
-insert into `sys_role_menu` values (7, 1064);
 insert into `sys_role_menu` values (7, 1067);
 insert into `sys_role_menu` values (7, 1068);
-insert into `sys_role_menu` values (7, 1069);
 insert into `sys_role_menu` values (7, 1072);
 insert into `sys_role_menu` values (7, 1073);
+insert into `sys_role_menu` values (7, 1077);
 insert into `sys_role_menu` values (7, 1078);
 insert into `sys_role_menu` values (7, 1082);
 insert into `sys_role_menu` values (7, 1083);
 insert into `sys_role_menu` values (7, 1087);
-insert into `sys_role_menu` values (7, 1102);
+insert into `sys_role_menu` values (7, 1098);
+insert into `sys_role_menu` values (7, 1103);
 insert into `sys_role_menu` values (7, 2023);
 insert into `sys_role_menu` values (7, 2024);
 insert into `sys_role_menu` values (7, 2025);
@@ -6445,11 +6458,11 @@ create table `cmc_tender`  (
   `tender_id` 			char(19)  		not null 		comment '投标id（2024-001）',
   `project_name` 		varchar(50)  	default null 	comment '投标项目名称',
   `party_a` 			varchar(50)  	default null 	comment '招标业主',
-  `a_person` 			varchar(10)  	default null 	comment '业主联系人',
-  `a_phone` 			varchar(11)  	default null 	comment '业主联系电话',
+  `a_person` 			varchar(50)  	default null 	comment '业主联系人',
+  `a_phone` 			varchar(50)  	default null 	comment '业主联系电话',
   `agent` 				varchar(50)  	default null 	comment '招标代理',
-  `agent_person` 		varchar(10)  	default null 	comment '代理联系人',
-  `agent_phone` 		varchar(11)  	default null 	comment '代理联系电话',
+  `agent_person` 		varchar(50)  	default null 	comment '代理联系人',
+  `agent_phone` 		varchar(50)  	default null 	comment '代理联系电话',
   `place` 				varchar(50)  	default null 	comment '招标地点',
   `dept` 				bigint 			default null 	comment '投标部门',
   `trustee` 			bigint 			default null 	comment '投标委托人',

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

@@ -543,7 +543,7 @@ export default {
           });
         })
       } else if (this.taskName == '分管审核' || this.taskName == '党工团审核' || this.taskName == '总经理审核') {
-        getUserByRole({ roleId: 4 }).then(result => {
+        getUserByRole({ roleId: 5 }).then(result => {
           this.$set(this.taskForm.variables, "approvalList", result.data);
           complete(this.taskForm).then(response => {
             this.$modal.msgSuccess(response.msg);

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
  * @LastEditors: wrh
- * @LastEditTime: 2024-06-04 10:52:17
+ * @LastEditTime: 2024-06-04 13:51:00
 -->
 
 <template>
@@ -393,7 +393,7 @@ export default {
     // 获取下一个审批人
     getNextFlowNodeApproval() {
       if (this.taskName == '设备申请') {
-        getUserByRole({ roleId: 5 }).then(result => {
+        getUserByRole({ roleId: 4 }).then(result => {
           this.$set(this.taskForm.variables, "approval", result.data[0]);
           complete(this.taskForm).then(response => {
             this.$modal.msgSuccess(response.msg);
@@ -415,7 +415,7 @@ export default {
           this.$emit('goBack')
         });
       } else if (this.taskName == '申请确认') {
-        getUserByRole({ roleId: 5 }).then(result => {
+        getUserByRole({ roleId: 4 }).then(result => {
           this.$set(this.taskForm.variables, "approval", result.data[0]);
           complete(this.taskForm).then(response => {
             this.$modal.msgSuccess(response.msg);

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

@@ -990,7 +990,7 @@ export default {
         if (vaild) {
           this.preserve();
           if (this.taskName == "结算发起") {
-            getUserByRole({ roleId: 5 }).then((res) => {
+            getUserByRole({ roleId: 4 }).then((res) => {
               this.getNextFlowNodeFn(res.data[0]);
             });
           } else if (this.taskName == "综合事务部处理") {

oa-ui/src/views/oa/car/detail.vue

@@ -104,10 +104,10 @@
               <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
                 v-hasPermi="['car:record:add']">新增</el-button>
             </el-col>
-            <el-col :span="1.5">
+            <!-- <el-col :span="1.5">
               <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
                 v-hasPermi="['car:record:edit']">修改</el-button>
-            </el-col>
+            </el-col> -->
             <el-col :span="1.5">
               <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
                 @click="handleDelete" v-hasPermi="['car:record:remove']">删除</el-button>
@@ -133,7 +133,7 @@
                 {{ scope.row.expense + '元' }}
               </template>
             </el-table-column>
-            <el-table-column label="发生日期" align="center" prop="occurDate" width="180">
+            <el-table-column label="发生日期" align="center" prop="occurDate">
               <template slot-scope="scope">
                 {{ scope.row.occurDate }}
               </template>

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

@@ -70,8 +70,8 @@
       <el-table-column label="操作" align="center" width="200px">
 
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAddDetail(scope.row)"
-            v-hasPermi="['oa:car:add']">添加明细</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleAddDetail(scope.row)"
+            v-hasPermi="['oa:car:query']">查看明细</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['oa:car:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" style="color: #fc0000;"

oa-ui/src/views/oa/device/detail.vue

@@ -131,7 +131,7 @@
               </template>
             </el-table-column>
             <el-table-column label="费用金额" align="center" prop="expense" />
-            <el-table-column label="发生日期" align="center" prop="occurDate" width="180">
+            <el-table-column label="发生日期" align="center" prop="occurDate">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.occurDate, '{y}-{m}-{d}') }}</span>
               </template>
@@ -237,7 +237,7 @@
                 {{ scope.row.receiveDept ? scope.row.receiveDept.deptName : '' }}
               </template>
             </el-table-column>
-            <el-table-column label="移交日期" align="center" prop="handoverDate" width="180">
+            <el-table-column label="移交日期" align="center" prop="handoverDate">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.handoverDate, '{y}-{m}-{d}') }}</span>
               </template>

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

@@ -77,8 +77,8 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAddDetail(scope.row)"
-            v-hasPermi="['oa:device:add']">添加明细</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleAddDetail(scope.row)"
+            v-hasPermi="['oa:device:query']">查看明细</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['oa:device:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" style="color: #fc0000;"

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

@@ -1,62 +1,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="workItem">
+      <el-form-item label="工作类别" prop="workType">
         <el-input
-          v-model="queryParams.workItem"
-          placeholder="请输入工作内容"
+          v-model="queryParams.workType"
+          placeholder="请输入工作类别"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="内容细项" prop="subItem">
-        <el-input
-          v-model="queryParams.subItem"
-          placeholder="请输入内容细项"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单价比例" prop="pricePercentage">
-        <el-input
-          v-model="queryParams.pricePercentage"
-          placeholder="请输入单价比例"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="等级或比例尺" prop="scaleGrade">
-        <el-input
-          v-model="queryParams.scaleGrade"
-          placeholder="请输入等级或比例尺"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单位" prop="unit">
-        <el-input
-          v-model="queryParams.unit"
-          placeholder="请输入单位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="一般地类单价" prop="commonPrice">
-        <el-input
-          v-model="queryParams.commonPrice"
-          placeholder="请输入一般地类单价"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="复杂地类单价" prop="complexPrice">
+      <el-form-item label="工作内容" prop="workItem">
         <el-input
-          v-model="queryParams.complexPrice"
-          placeholder="请输入复杂地类单价"
+          v-model="queryParams.workItem"
+          placeholder="请输入工作内容"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </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>
@@ -71,7 +32,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['oa:price:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -82,7 +42,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['oa:price:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -93,7 +52,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['oa:price:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -103,7 +61,6 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['oa:price:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -114,8 +71,6 @@
       <el-table-column label="结算单价id" align="center" prop="id" />
       <el-table-column label="工作类别" align="center" prop="workType" />
       <el-table-column label="工作内容" align="center" prop="workItem" />
-      <el-table-column label="内容细项" align="center" prop="subItem" />
-      <el-table-column label="单价比例" align="center" prop="pricePercentage" />
       <el-table-column label="等级或比例尺" align="center" prop="scaleGrade" />
       <el-table-column label="单位" align="center" prop="unit" />
       <el-table-column label="一般地类单价" align="center" prop="commonPrice" />
@@ -127,14 +82,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:price:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:price:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -150,16 +103,19 @@
 
     <!-- 添加或修改cmc结算单价对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="工作类别" prop="workType">
+          <el-input v-model="form.workType" placeholder="请输入工作类别" />
+        </el-form-item>
         <el-form-item label="工作内容" prop="workItem">
           <el-input v-model="form.workItem" placeholder="请输入工作内容" />
         </el-form-item>
-        <el-form-item label="内容细项" prop="subItem">
+        <!-- <el-form-item label="内容细项" prop="subItem">
           <el-input v-model="form.subItem" placeholder="请输入内容细项" />
         </el-form-item>
         <el-form-item label="单价比例" prop="pricePercentage">
           <el-input v-model="form.pricePercentage" placeholder="请输入单价比例" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="等级或比例尺" prop="scaleGrade">
           <el-input v-model="form.scaleGrade" placeholder="请输入等级或比例尺" />
         </el-form-item>

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

@@ -77,8 +77,8 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAddDetail(scope.row)"
-            v-hasPermi="['oa:car:edit']">添加明细</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleAddDetail(scope.row)"
+            v-hasPermi="['oa:device:query']">查看明细</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['oa:device:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" style="color: #fc0000;"

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

@@ -28,10 +28,10 @@
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['oa:tender:remove']">删除</el-button>
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['oa:tender:export']">导出</el-button>
-      </el-col> -->
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>