技术方案管理

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

@@ -88,9 +88,9 @@ public class CmcProjectSubContractController extends BaseController
      * 删除cmc项目分包合同
      */
     @Log(title = "cmc项目分包合同", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{projectIds}")
-    public AjaxResult remove(@PathVariable String[] projectIds)
+	@DeleteMapping("/{subContractIds}")
+    public AjaxResult remove(@PathVariable String[] subContractIds)
     {
-        return toAjax(cmcProjectSubContractService.deleteCmcProjectSubContractByProjectIds(projectIds));
+        return toAjax(cmcProjectSubContractService.deleteCmcProjectSubContractBySubContractIds(subContractIds));
     }
 }

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

@@ -22,8 +22,12 @@ public class CmcArchive extends BaseEntity
     private String archiveId;
 
     /** 项目id */
-    @Excel(name = "项目id")
     private String projectId;
+    @Excel(name = "项目编号")
+    private String projectNumber;
+    @Excel(name = "项目名称")
+    private String projectName;
+    private CmcProject project;
 
     /** 成果汇交日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -117,6 +121,17 @@ public class CmcArchive extends BaseEntity
     {
         return projectId;
     }
+    public void setProject(CmcProject project)
+    {
+        this.project = project;
+        this.projectNumber = project == null ? "" : project.getProjectNumber();
+        this.projectName = project == null ? "" : project.getProjectName();
+    }
+
+    public CmcProject getProject()
+    {
+        return project;
+    }
     public void setSubmitTime(Date submitTime) 
     {
         this.submitTime = submitTime;

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

@@ -22,8 +22,11 @@ public class CmcBudget extends BaseEntity
     private String budgetId;
 
     /** 项目id */
-    @Excel(name = "项目id")
     private String projectId;
+    @Excel(name = "项目编号")
+    private String projectNumber;
+    @Excel(name = "项目名称")
+    private String projectName;
 
     private CmcProject project;
 
@@ -128,6 +131,8 @@ public class CmcBudget extends BaseEntity
     public void setProject(CmcProject project)
     {
         this.project = project;
+        this.projectNumber = project == null ? "" : project.getProjectNumber();
+        this.projectName = project == null ? "" : project.getProjectName();
     }
 
     public CmcProject getProject()

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

@@ -133,7 +133,7 @@ public class CmcSubContract extends BaseEntity
     public void setPartner(CmcPartner partner)
     {
         this.partner = partner;
-        this.partnerName = partner.getPartnerName();
+        this.partnerName = partner == null ? "" : partner.getPartnerName();
     }
 
     public CmcPartner getPartner()
@@ -179,7 +179,7 @@ public class CmcSubContract extends BaseEntity
     public void setDraftUser(SysUser draftUser)
     {
         this.draftUser = draftUser;
-        this.draftUserName = draftUser.getNickName();
+        this.draftUserName = draftUser == null ? "" : draftUser.getNickName();
     }
 
     public SysUser getDraftUser()
@@ -189,7 +189,7 @@ public class CmcSubContract extends BaseEntity
     public void setManagerUser(SysUser managerUser)
     {
         this.managerUser = managerUser;
-        this.managerUserName = managerUser.getNickName();
+        this.managerUserName = managerUser == null ? "" : managerUser.getNickName();
     }
 
     public SysUser getManagerUser()

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

@@ -22,8 +22,12 @@ public class CmcTechnical extends BaseEntity
     private String technicalId;
 
     /** 项目id */
-    @Excel(name = "项目id")
     private String projectId;
+    @Excel(name = "项目编号")
+    private String projectNumber;
+    @Excel(name = "项目名称")
+    private String projectName;
+    private CmcProject project;
 
     /** 技术负责人 */
     @Excel(name = "技术负责人")
@@ -117,6 +121,17 @@ public class CmcTechnical extends BaseEntity
     {
         return projectId;
     }
+    public void setProject(CmcProject project)
+    {
+        this.project = project;
+        this.projectNumber = project == null ? "" : project.getProjectNumber();
+        this.projectName = project == null ? "" : project.getProjectName();
+    }
+
+    public CmcProject getProject()
+    {
+        return project;
+    }
     public void setTechnicalDirector(Long technicalDirector)
     {
         this.technicalDirector = technicalDirector;

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcProjectSubContractMapper.java

@@ -54,8 +54,8 @@ public interface CmcProjectSubContractMapper
     /**
      * 批量删除cmc项目分包合同
      * 
-     * @param projectIds 需要删除的数据主键集合
+     * @param subContractIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcProjectSubContractByProjectIds(String[] projectIds);
+    public int deleteCmcProjectSubContractBySubContractIds(String[] subContractIds);
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcProjectSubContractService.java

@@ -46,10 +46,10 @@ public interface ICmcProjectSubContractService
     /**
      * 批量删除cmc项目分包合同
      * 
-     * @param projectIds 需要删除的cmc项目分包合同主键集合
+     * @param subContractIds 需要删除的cmc项目分包合同主键集合
      * @return 结果
      */
-    public int deleteCmcProjectSubContractByProjectIds(String[] projectIds);
+    public int deleteCmcProjectSubContractBySubContractIds(String[] subContractIds);
 
     /**
      * 删除cmc项目分包合同信息

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcProjectSubContractServiceImpl.java

@@ -70,13 +70,13 @@ public class CmcProjectSubContractServiceImpl implements ICmcProjectSubContractS
     /**
      * 批量删除cmc项目分包合同
      * 
-     * @param projectIds 需要删除的cmc项目分包合同主键
+     * @param subContractIds 需要删除的cmc项目分包合同主键
      * @return 结果
      */
     @Override
-    public int deleteCmcProjectSubContractByProjectIds(String[] projectIds)
+    public int deleteCmcProjectSubContractBySubContractIds(String[] subContractIds)
     {
-        return cmcProjectSubContractMapper.deleteCmcProjectSubContractByProjectIds(projectIds);
+        return cmcProjectSubContractMapper.deleteCmcProjectSubContractBySubContractIds(subContractIds);
     }
 
     /**

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

@@ -15,7 +15,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCmcProjectSubContractList" parameterType="CmcProjectSubContract" resultMap="CmcProjectSubContractResult">
         <include refid="selectCmcProjectSubContractVo"/>
-        <where>  
+        <where>
+            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
+            <if test="subContractId != null  and subContractId != ''"> and sub_contract_id = #{subContractId}</if>
         </where>
     </select>
     
@@ -48,10 +50,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from cmc_project_sub_contract where project_id = #{projectId}
     </delete>
 
-    <delete id="deleteCmcProjectSubContractByProjectIds" parameterType="String">
-        delete from cmc_project_sub_contract where project_id in 
-        <foreach item="projectId" collection="array" open="(" separator="," close=")">
-            #{projectId}
+    <delete id="deleteCmcProjectSubContractBySubContractIds" parameterType="String">
+        delete from cmc_project_sub_contract where sub_contract_id in
+        <foreach item="subContractId" collection="array" open="(" separator="," close=")">
+            #{subContractId}
         </foreach>
     </delete>
 </mapper>

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

@@ -25,6 +25,7 @@
         <association property="planUser"    javaType="SysUser"         resultMap="PlanUserResult" />
         <association property="designUser"    javaType="SysUser"         resultMap="DesignUserResult" />
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
+        <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="PlanUserResult">
@@ -42,14 +43,21 @@
         <result property="nickName"    column="manager_nick_name"    />
     </resultMap>
 
+    <resultMap type="CmcProject" id="CmcProjectResult">
+        <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="projectName"    column="project_name"    />
+    </resultMap>
+
     <sql id="selectCmcTechnicalVo">
-        select t.technical_id, t.project_id, t.technical_director, t.technical_designer, u.nick_name as design_nick_name, t.technical_planner, u1.nick_name as plan_nick_name,
+        select t.technical_id, t.project_id, p.project_number, p.project_name, t.technical_director, t.technical_designer, u.nick_name as design_nick_name, t.technical_planner, u1.nick_name as plan_nick_name,
                t.plan_comment, t.quality_inspector, t.technical_time, t.technical_document, t.modify_document, t.final_document, t.design_description, t.technical_comment,
                t.manager_user_id, u2.nick_name as manager_nick_name,
                t.manage_comment, t.technical_upload_time, t.tech_approval_time, t.manage_approval_time from cmc_technical as t
          left join sys_user as u on u.user_id = t.technical_designer
          left join sys_user as u1 on u1.user_id = t.technical_planner
          left join sys_user as u2 on u2.user_id = t.manager_user_id
+         left join cmc_project as p on p.project_id = t.project_id
     </sql>
 
     <select id="selectCmcTechnicalList" parameterType="CmcTechnical" resultMap="CmcTechnicalResult">

oa-back/sql/sql.sql

@@ -379,7 +379,7 @@ create table sys_menu (
 -- 一级菜单
 
 insert into sys_menu values('2048', '办公管理', '0', '6', 'oa', 		null, '', 1, 0, 'M', '0', '0', '', 'component', 'admin', sysdate(), '', null, '办公管理目录');
-insert into sys_menu values('2049', '经营管理', '0', '5', 'business', 	null, '', 1, 0, 'M', '0', '0', '', 'cost', 		'admin', sysdate(), '', null, '经营管理目录');
+insert into sys_menu values('2049', '经营管理', '0', '5', 'business', 	null, '', 1, 0, 'M', '0', '0', '', 'business', 	'admin', sysdate(), '', null, '经营管理目录');
 insert into sys_menu values('2050', '生产管理', '0', '4', 'product', 	null, '', 1, 0, 'M', '0', '0', '', 'date-range','admin', sysdate(), '', null, '生产管理目录');
 insert into sys_menu values('1', 	'系统管理', '0', '1', 'system',		null, '', 1, 0, 'M', '0', '0', '', 'system',	'admin', sysdate(), '', null, '系统管理目录');
 insert into sys_menu values('2', 	'系统监控', '0', '2', 'monitor',	null, '', 1, 0, 'M', '0', '0', '', 'monitor',	'admin', sysdate(), '', null, '系统监控目录');
@@ -389,14 +389,14 @@ insert into sys_menu values('5', 	'设备管理', '2048', '2', 'device',	null, '
 insert into sys_menu values('6', 	'车辆管理', '2048', '3', 'car',		null, '', 1, 0, 'M', '0', '0', '', 'car',		'admin', sysdate(), '', null, '车辆管理菜单');
 insert into sys_menu values('7', 	'合同管理', '2049', '2', 'contract',null, '', 1, 0, 'M', '0', '0', '', 'documentation',	'admin', sysdate(), '', null, '合同管理菜单');
 insert into sys_menu values('8', 	'保证金管理','2049','3', 'deposit',	null, '', 1, 0, 'M', '0', '0', '', 'cost',		'admin', sysdate(), '', null, '保证金管理菜单');
-insert into sys_menu values('9', 	'产值结算', '2050', '8', 'settle',	null, '', 1, 0, 'M', '0', '0', '', 'money',		'admin', sysdate(), '', null, '产值结算菜单');
+insert into sys_menu values('9', 	'产值结算', '2050', '8', 'settle',	null, '', 1, 0, 'M', '0', '0', '', 'settlement',		'admin', sysdate(), '', null, '产值结算菜单');
 insert into sys_menu values('10', 	'资料成果', '2050', '7','archive',	null, '', 1, 0, 'M', '0', '0', '', 'education',		'admin', sysdate(), '', null, '资料成果菜单');
 insert into sys_menu values('11', 	'投标管理', '2049', '1', 'tender',	'oa/tender/index', 			'', 1, 0, 'C', '0', '0', 'oa:tender:list',	'guide',	'admin', sysdate(), '', null, '投标管理菜单');
 insert into sys_menu values('12', 	'合作单位', '2049', '4', 'partner', 'oa/partner/index',  		'', 1, 0, 'C', '0', '0', 'oa:partner:list', 'titles',	'admin', sysdate(), '', NULL, '合作单位管理菜单');
 insert into sys_menu values('13', 	'品牌项目台账','2050','2', 'brand', 'oa/brand/brandProject', 	'', 1, 0, 'C', '0', '0', 'oa:brand:list',   'Branding',	'admin', sysdate(), '', null, '品牌项目台账菜单');
 insert into sys_menu values('14', 	'测绘项目台账','2050','1','project','oa/project/index', 		'', 1, 0, 'C', '0', '0', 'oa:project:list', 'project',	'admin', sysdate(), '', null, '测绘项目台账菜单');
 insert into sys_menu values('15', 	'预算管理', '2050', '3', 'budget',	'oa/budget/index', 			'', 1, 0, 'C', '0', '0', 'oa:budget:list', 	'build',	'admin', sysdate(), '', null, '预算管理菜单');
-insert into sys_menu values('16', 	'借款管理', '2050', '6', 'borrow',	'oa/borrow/index', 			'', 1, 0, 'C', '0', '0', 'oa:borrow:list', 	'money',	'admin', sysdate(), '', null, '借款管理菜单');
+insert into sys_menu values('16', 	'借款管理', '2050', '6', 'borrow',	'oa/borrow/index', 			'', 1, 0, 'C', '0', '0', 'oa:borrow:list', 	'borrow',	'admin', sysdate(), '', null, '借款管理菜单');
 insert into sys_menu values('17', 	'安全交底', '2050', '4', 'safe',	'oa/safe/index', 			'', 1, 0, 'C', '0', '0', 'oa:safe:list', 	'validCode','admin', sysdate(), '', null, '安全交底菜单');
 insert into sys_menu values('18', 	'技术方案', '2050', '5', 'technical','oa/technical/index', 		'', 1, 0, 'C', '0', '0', 'oa:technical:list','nested',	'admin', sysdate(), '', null, '技术方案菜单');
 insert into sys_menu values('19', 	'考核管理', '0', '7', 'assess',	'oa/assess/index', 			'', 1, 0, 'C', '0', '0', 'oa:assess:list',  'logininfor','admin',sysdate(), '', null, '考核管理菜单');
@@ -421,7 +421,7 @@ insert into sys_menu values('115',  '表单构建', '3',   '1', 'build',      't
 insert into sys_menu values('116',  '代码生成', '3',   '2', 'gen',        'tool/gen/index',           '', 1, 0, 'C', '0', '0', 'tool:gen:list',           'code',          'admin', sysdate(), '', null, '代码生成菜单');
 insert into sys_menu values('117',  '系统接口', '3',   '3', 'swagger',    'tool/swagger/index',       '', 1, 0, 'C', '0', '0', 'tool:swagger:list',       'swagger',       'admin', sysdate(), '', null, '系统接口菜单');
 insert into sys_menu values('118',  '人员信息', '4',   '1', 'people',	  'oa/staff/index',       	  '', 1, 0, 'C', '0', '0', 'system:user:list',        'peoples',       'admin', sysdate(), '', null, '人员信息菜单');
-insert into sys_menu values('119',  '岗位工资', '4',   '2', 'salary',     'oa/staff/salary',       	  '', 1, 0, 'C', '0', '0', 'oa:salary:list',       	  'cost',          'admin', sysdate(), '', null, '岗位工资菜单');
+insert into sys_menu values('119',  '岗位工资', '4',   '2', 'salary',     'oa/staff/salary',       	  '', 1, 0, 'C', '0', '0', 'oa:salary:list',       	  'money',         'admin', sysdate(), '', null, '岗位工资菜单');
 insert into sys_menu values('120', 	'仪器设备', '5',   '1', 'equipment',  'oa/device/index', 		  '', 1, 0, 'C', '0', '0', 'oa:device:list', 		  'component',	   'admin', sysdate(), '', null, '仪器设备菜单');
 insert into sys_menu values('121', 	'办公设备', '5',   '2', 'supply',	  'oa/supply/index', 		  '', 1, 0, 'C', '0', '0', 'oa:supply:list', 		  'desktop',	   'admin', sysdate(), '', null, '办公设备菜单');
 insert into sys_menu values('122', 	'申领记录', '5',   '3', 'approval',	  'oa/device/approval',		  '', 1, 0, 'C', '0', '0', 'oa:deviceApproval:list',  'form',		   'admin', sysdate(), '', null, '申领记录菜单');
@@ -436,8 +436,8 @@ insert into sys_menu values('130', 	'承接合同', '7',   '1', 'contract',	  'o
 insert into sys_menu values('131', 	'分包合同', '7',   '2', 'subContract','oa/contract/subContract',  '', 1, 0, 'C', '0', '0', 'oa:subContract:list',	  'documentation', 'admin', sysdate(), '', null, '分包合同菜单');
 insert into sys_menu values('132', 	'投标保证金', '8', '1', 'tender',	  'oa/deposit/index',  		  '', 1, 0, 'C', '0', '0', 'oa:deposit:list',	  	  'cost', 		   'admin', sysdate(), '', null, '投标保证金菜单');
 insert into sys_menu values('133', 	'合同保证金', '8', '2', 'contract',	  'oa/deposit/index',		  '', 1, 0, 'C', '0', '0', 'oa:deposit:list',	  	  'cost',		   'admin', sysdate(), '', null, '合同保证金菜单');
-insert into sys_menu values('134', 	'结算管理', '9',   '1', 'settle',	  'oa/settle/index',		  '', 1, 0, 'C', '0', '0', 'oa:settle:list',	  	  'money',		   'admin', sysdate(), '', null, '结算管理菜单');
-insert into sys_menu values('135', 	'结算单价', '9',   '2', 'price',	  'oa/price/index',		  	  '', 1, 0, 'C', '0', '0', 'oa:price:list',	  	  	  'money',		   'admin', sysdate(), '', null, '结算单价菜单');
+insert into sys_menu values('134', 	'结算管理', '9',   '1', 'settle',	  'oa/settle/index',		  '', 1, 0, 'C', '0', '0', 'oa:settle:list',	  	  'settle',		   'admin', sysdate(), '', null, '结算管理菜单');
+insert into sys_menu values('135', 	'结算单价', '9',   '2', 'price',	  'oa/price/index',		  	  '', 1, 0, 'C', '0', '0', 'oa:price:list',	  	  	  'price',		   'admin', sysdate(), '', null, '结算单价菜单');
 insert into sys_menu values('136', 	'成果归档', '10',   '1', 'archive',	  'oa/archive/index',		  '', 1, 0, 'C', '0', '0', 'oa:archive:list',	  	  'education',	   'admin', sysdate(), '', null, '成果归档菜单');
 insert into sys_menu values('137', 	'资料管理', '10',   '2', 'file',	  'file/filesProject/index',  '', 1, 0, 'C', '0', '0', 'oa:archive:list',	  	  'education',	   'admin', sysdate(), '', null, '资料管理菜单');
 insert into sys_menu values('138', 	'一张图', 	'10',   '3', 'gis',	  	  'file/index',		  	  	  '', 1, 0, 'C', '0', '0', '',	  	  	  			  'international', 'admin', sysdate(), '', null, '一张图菜单');
@@ -1141,7 +1141,7 @@ insert into `sys_user_post` values (10, 9);
 insert into `sys_user_post` values (11, 9);
 insert into `sys_user_post` values (12, 9);
 insert into `sys_user_post` values (12, 33);
-insert into `sys_user_post` values (13, 13);
+insert into `sys_user_post` values (13, 9);
 insert into `sys_user_post` values (13, 15);
 insert into `sys_user_post` values (14, 13);
 insert into `sys_user_post` values (14, 15);
@@ -9642,7 +9642,7 @@ INSERT INTO `cmc_partner` VALUES ('0019', '成都精准工程造价咨询有限
 INSERT INTO `cmc_partner` VALUES ('0020', '成都林辉测绘服务有限公司', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_partner` VALUES ('0021', '成都六合四游遥感技术有限公司', '赵静', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_partner` VALUES ('0022', '成都民心勘察测绘有限责任公司', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_partner` VALUES ('0023', '成都木乘科技有限公司（成都田冶测绘有限公司）', '陈存鸿', '18780226389', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_partner` VALUES ('0023', '成都木乘科技有限公司（原成都田冶测绘有限公司）', '陈存鸿', '18780226389', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_partner` VALUES ('0024', '成都木尔科技有限公司', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_partner` VALUES ('0025', '成都三维云景科技发展有限公司', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_partner` VALUES ('0026', '成都时代加华软件技术有限公司', '黄振戈', '18981963993', NULL, NULL, NULL, NULL, NULL, NULL, NULL);

oa-ui/src/assets/icons/svg/borrow.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="1718775673725" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="17455" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M917.7 221.5H106.3c-39.9 0-72.2 32.3-72.2 72v572.6c0 39.8 32.3 72.2 72.2 72.2h811.5c39.8 0 72.2-32.3 72.2-72.2V293.5a72.3 72.3 0 0 0-72.4-72z m-270 414.7c18.8 0 34.1 15.4 34.1 34.1s-15.4 34.1-34.1 34.1H546.1v56.3c0 18.8-15.4 34.1-34.1 34.1s-34.1-15.4-34.1-34.1v-56.3H376.4c-18.8 0-34.1-15.4-34.1-34.1s15.4-34.1 34.1-34.1h101.5v-67.4H376.4c-18.8 0-34.1-15.4-34.1-34.1s15.4-34.1 34.1-34.1h75.9l-77.5-77.5c-13.3-13.3-13.3-35 0-48.3s35-13.3 48.3 0l88.9 88.9 88.9-88.9c13.3-13.3 35-13.3 48.3 0s13.3 35 0 48.3l-77.5 77.5h75.9c18.8 0 34.1 15.4 34.1 34.1s-15.4 34.1-34.1 34.1H546.1v67.4h101.5z m226.1-497.1H150.2c-18.8 0-34.1-15.4-34.1-34.1s15.4-34.1 34.1-34.1h723.6c18.8 0 34.1 15.4 34.1 34.1s-15.4 34.1-34.1 34.1z" fill="#ffffff" p-id="17456"></path></svg>

oa-ui/src/assets/icons/svg/business.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="1718776318420" class="icon" viewBox="0 0 1114 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="36968" xmlns:xlink="http://www.w3.org/1999/xlink" width="34.8125" height="32"><path d="M43.971765 206.456471l114.025411-176.248471a46.351059 46.351059 0 0 1 39.152942-21.323294h724.690823c15.751529 0 30.268235 8.041412 39.092706 21.202823l112.519529 174.682353c12.137412 8.673882 19.696941 22.708706 19.696942 37.888v713.667765c0 25.479529-21.082353 46.501647-46.652236 46.501647H73.095529c-25.539765 0-46.682353-21.022118-46.682353-46.501647V242.657882c0-14.215529 6.625882-27.437176 17.528471-36.201411z m913.347764-10.300236l-60.897882-94.268235H222.569412l-60.928 94.268235h795.648zM119.747765 289.129412v620.66447h880.097882V289.159529H119.747765z m93.184 270.757647a26.322824 26.322824 0 0 1-26.292706-26.322824v-40.387764c0-14.546824 11.745882-26.322824 26.292706-26.322824h399.540706c14.546824 0 26.322824 11.776 26.322823 26.322824v40.357647a26.322824 26.322824 0 0 1-26.322823 26.322823H212.931765z m188.084706 193.626353H212.931765a26.322824 26.322824 0 0 1-26.292706-26.322824v-40.357647c0-14.546824 11.745882-26.322824 26.292706-26.322823h188.084706c14.516706 0 26.292706 11.745882 26.292705 26.292706v40.387764a26.322824 26.322824 0 0 1-26.292705 26.322824z m467.847529-201.276236a26.292706 26.292706 0 0 1 37.195294-0.060235l28.852706 28.702118c10.300235 10.24 10.360471 26.925176 0.090353 37.225412l-180.103529 180.404705c-8.643765 8.643765-20.540235 13.552941-33.008942 13.552942-12.197647 0-23.250824-4.638118-32.527058-13.040942l-0.481883-0.451764-83.06447-82.160941a26.322824 26.322824 0 0 1-0.210824-37.195295l0.150588-0.150588 28.852706-28.732235a26.322824 26.322824 0 0 1 37.044706-0.090353l50.145882 49.483294 147.064471-147.486118z" fill="#ffffff" p-id="36969"></path></svg>

oa-ui/src/assets/icons/svg/price.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="1718772412027" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10246" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M509.11 936.5A424.16 424.16 0 0 1 344 121.73a424.15 424.15 0 0 1 330.18 781.44 421.43 421.43 0 0 1-165.07 33.33z m0-788.11c-200.74 0-364.05 163.31-364.05 364.05S308.37 876.5 509.11 876.5s364.05-163.31 364.05-364.05S709.85 148.4 509.11 148.4z" fill="#ffffff" p-id="10247"></path><path d="M480.34 701.59v-88.87h-75.09q-31.94-1.85-31.91-28.16 0-28.16 31.91-26.28h75.09v-30h-75.09q-33.79 0-31.91-28.16-1.89-28.16 31.91-26.28h45.05l-88.23-135.2q-15-28.16 7.51-41.3 24.37-13.11 41.3 15l97.62 146.44 95.74-146.42q20.64-28.16 45.05-15 22.53 16.9 5.63 43.18L566.69 473.8h43.18q37.53 0 33.79 28.16 1.85 26.31-31.91 26.28h-75.09v30h75.09q37.53-1.85 33.79 28.16 1.85 26.31-33.79 26.28h-75.09v88.88q0 31.9-28.16 30-28.16 1.92-28.16-29.97z" fill="#ffffff" p-id="10248"></path></svg>

oa-ui/src/assets/icons/svg/settle.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="1718769012223" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9855" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M397.226667 896H170.666667a42.666667 42.666667 0 0 1-42.666667-42.666667V170.666667a42.666667 42.666667 0 0 1 42.666667-42.666667h512a42.666667 42.666667 0 0 1 42.666666 42.666667v324.266666a42.666667 42.666667 0 1 0 85.333334 0V170.666667a128 128 0 0 0-128-128H170.666667a128 128 0 0 0-128 128v682.666666a128 128 0 0 0 128 128h226.56a42.666667 42.666667 0 1 0 0-85.333333zM585.813333 859.306667a11.093333 11.093333 0 0 0-2.133333 3.84v2.133333L554.666667 970.24a8.533333 8.533333 0 0 0 10.666666 10.666667l104.533334-28.586667a6.826667 6.826667 0 0 0 3.84 0l235.52-235.093333-90.88-90.453334zM961.706667 592.213333l-17.92-18.346666a51.2 51.2 0 0 0-72.533334 0l-23.893333 24.32L938.666667 688.64l23.893333-24.32a50.773333 50.773333 0 0 0-0.853333-72.106667z" p-id="9856" fill="#ffffff"></path><path d="M597.333333 546.986667a21.333333 21.333333 0 0 0 21.333334-21.333334 21.333333 21.333333 0 0 0-21.333334-21.333333h-149.333333v-85.333333H597.333333a21.333333 21.333333 0 0 0 21.333334-21.333334 21.333333 21.333333 0 0 0-21.333334-21.333333h-159.146666 2.133333l128-109.653333a21.333333 21.333333 0 0 0-27.733333-32.426667L426.666667 330.666667l-112.213334-98.133334a21.76 21.76 0 0 0-30.293333 0 20.906667 20.906667 0 0 0 0 29.866667l128 110.506667h2.56H256a21.333333 21.333333 0 0 0-21.333333 21.333333 21.333333 21.333333 0 0 0 21.333333 21.333333h149.333333v85.333334H256a21.333333 21.333333 0 0 0-21.333333 21.333333 21.333333 21.333333 0 0 0 21.333333 21.333333h149.333333V682.666667a21.333333 21.333333 0 0 0 42.666667 0v-135.68z" p-id="9857" fill="#ffffff"></path></svg>

oa-ui/src/assets/icons/svg/settlement.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="1718768852536" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6100" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M729.6 1024a281.6 281.6 0 1 1 281.6-281.6A281.6 281.6 0 0 1 729.6 1024z m0-499.243A217.643 217.643 0 1 0 947.26 742.4 217.655 217.655 0 0 0 729.6 524.757z m64.375 170.71h10.292a27.733 27.733 0 0 1 0 55.466H755.2v21.334h49.067a27.733 27.733 0 0 1 0 55.466H755.2v44.8a27.733 27.733 0 0 1-55.467 0v-44.8h-49.066a27.733 27.733 0 0 1 0-55.466h49.066v-21.334h-49.066a27.733 27.733 0 0 1 0-55.466h14.114l-39.305-39.296A27.733 27.733 0 0 1 664.7 616.96l65.122 65.11 64-64a27.405 27.405 0 0 1 38.775 38.74zM800 409.6a32 32 0 0 1-32-32c0-0.725 0.166-1.408 0.213-2.133H768V106.624a42.667 42.667 0 0 0-42.667-42.667H119.467A42.667 42.667 0 0 0 76.8 106.624v742.4a42.667 42.667 0 0 0 42.667 42.667h243.2v0.256c0.716-0.043 1.403-0.214 2.133-0.214a32 32 0 0 1 0 64c-0.73 0-1.417-0.17-2.133-0.213v0.213H76.8a64 64 0 0 1-64-64V64a64 64 0 0 1 64-64H768a64 64 0 0 1 64 64v311.467h-0.213c0.047 0.725 0.213 1.408 0.213 2.133a32 32 0 0 1-32 32zM251.733 648.533h102.4a34.133 34.133 0 0 1 0 68.267h-102.4a34.133 34.133 0 0 1 0-68.267zM217.6 273.067a34.133 34.133 0 0 1 34.133-34.134h341.334a34.133 34.133 0 0 1 0 68.267H251.733a34.133 34.133 0 0 1-34.133-34.133zM439.467 512H251.733a34.133 34.133 0 0 1 0-68.267h187.734a34.133 34.133 0 0 1 0 68.267z" p-id="6101" fill="#ffffff"></path></svg>

oa-ui/src/views/oa/brand/brandProject.vue

@@ -37,7 +37,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="项目编号" align="center" prop="projectNumber" />
       <el-table-column label="项目名称" align="center" prop="projectName" />
-      <el-table-column label="甲方单位" align="center" prop="partyA" />
+      <el-table-column label="甲方单位" align="center" prop="partyA.partyAName" />
       <el-table-column label="甲方单位联系人" align="center" prop="aPerson" />
       <el-table-column label="甲方单位联系电话" align="center" prop="aPhone" />
       <el-table-column label="合作单位" align="center" prop="partner.partnerName" />

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

@@ -24,19 +24,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['oa:technical:add']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['oa:technical:edit']">修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['oa:technical:remove']">删除</el-button>
-      </el-col>
+    <el-row :gutter="10" class="mb8">    
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['oa:technical:export']">导出</el-button>
@@ -46,7 +34,8 @@
 
     <el-table v-loading="loading" :data="technicalList" @selection-change="handleSelectionChange">
       <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column label="项目id" align="center" prop="projectId" />
+      <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
+      <el-table-column label="项目名称" align="center" prop="project.projectName" />
       <el-table-column label="技术负责人" align="center" prop="technicalDirector">
         <template slot-scope="scope">
           {{ getUserName(scope.row.technicalDirector) }}
@@ -57,22 +46,22 @@
           {{ getUserName(scope.row.technicalDesigner) }}
         </template>
       </el-table-column>
-      <el-table-column label="技术安排人" align="center" prop="technicalPlanner">
+      <!-- <el-table-column label="技术安排人" align="center" prop="technicalPlanner">
         <template slot-scope="scope">
           {{ getUserName(scope.row.technicalPlanner) }}
         </template>
-      </el-table-column>
-      <el-table-column label="技术安排意见" align="center" prop="planComment" />
+      </el-table-column> -->
+      <!-- <el-table-column label="技术安排意见" align="center" prop="planComment" /> -->
       <el-table-column label="质量检查员" align="center" prop="qualityInspector">
         <template slot-scope="scope">
           {{ getUserNames(scope.row.qualityInspector) }}
         </template>
       </el-table-column>
-      <el-table-column label="技术安排时间" align="center" prop="technicalTime" width="180">
+      <!-- <el-table-column label="技术安排时间" align="center" prop="technicalTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.technicalTime, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="技术方案" align="center" prop="technicalDocument" />
       <el-table-column label="方案说明" align="center" prop="designDescription" />
       <!-- <el-table-column label="技术审核意见" align="center" prop="technicalComment" />
@@ -96,8 +85,6 @@
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
             v-hasPermi="['oa:technical:view']">查看</el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:technical:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
             v-hasPermi="['oa:technical:remove']">删除</el-button>
         </template>
@@ -166,14 +153,19 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog :title="title" :visible.sync="infoOpen" width="70%" append-to-body>
+      <technical-form :taskForm="taskForm" :taskName="''"></technical-form>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listTechnical, getTechnical, delTechnical, addTechnical, updateTechnical } from "@/api/oa/technical/technical";
+import technicalForm from '../../flowable/form/technicalForm.vue';
 
 export default {
   name: "Technical",
+  components: { technicalForm, },
   data() {
     return {
       // 遮罩层
@@ -194,6 +186,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      infoOpen: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -215,6 +208,7 @@ export default {
       },
       // 表单参数
       form: {},
+      taskForm: {},
       // 表单校验
       rules: {
       }
@@ -282,7 +276,8 @@ export default {
       this.title = "添加cmc技术交底";
     },
     handleView(row){
-
+      this.taskForm.formId = row.projectId;
+      this.infoOpen = true;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {